Moved store to new logging framework entirely
authorn.hoffmann <n.hoffmann@localhost>
Thu, 14 Oct 2010 12:12:53 +0000 (12:12 +0000)
committern.hoffmann <n.hoffmann@localhost>
Thu, 14 Oct 2010 12:12:53 +0000 (12:12 +0000)
142 files changed:
.gitattributes
taxeditor-store/META-INF/MANIFEST.MF
taxeditor-store/plugin.xml
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/CdmDataSourceRepository.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/AbstractDataSourceHandler.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/ChangeConnectionHandler.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/CloseConnectionHandler.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/DataSourceMenuPropertyTester.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/UpdateDataSourceHandler.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/view/CdmDataSourceLabelProvider.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/view/CdmDataSourceViewPart.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/view/CdmMetaDataAwareDataSourceContainer.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceMySQLWizardPage.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceSQLServerWizardPage.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceTypeSelectionWizardPage.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/LoginDialog.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/NewReferenceInputDialog.java [deleted file]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableFeaturesWizard.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableFeaturesWizardPage.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/featuretree/EditFeatureTreeWizardPage.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/featuretree/FeatureNodeTransfer.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/featuretree/FeatureTreeContentProvider.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/featuretree/FeatureTreeEditorWizard.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/featuretree/FeatureTreeLabelProvider.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/featuretree/SelectFeatureTreeWizard.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/featuretree/SelectFeatureTreeWizardPage.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/handler/ShowDataSourceViewHandler.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/handler/ShowErrorViewHandler.java [new file with mode: 0644]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/handler/ShowLoginWindowHandler.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/handler/ShowUserManagerViewHandler.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/ExportHandler.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/ImportHandler.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbcdImportWizard.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbstractExcelExportWizard.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbstractExcelImportWizard.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbstractExportWizard.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbstractImportWizard.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/BerlinModelExportWizard.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/BerlinModelImportWizard.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/EndnoteImportWizard.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ExcelNormalExplicitTaxaImportWizard.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ExportToFileDestinationWizardPage.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/GenericConfiguratorWizardPage.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ImportFromFileDataSourceWizardPage.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/JaxbExportWizard.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/JaxbImportSourceWizardPage.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/JaxbImportWizard.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/NomenclaturalCodeWizardPage.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/SddExportWizard.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/SddImportWizard.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/TcsExportWizard.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/TcsImportWizard.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/labels/DefaultLabelStrategy.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/labels/LabelImageProvider.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/labels/ZoologicalNameLabelStrategy.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractCdmViewPart.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractDataChangeBehaviour.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/AuthorHelper.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/CdmProgressMonitorAdapter.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/CommonHelper.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/FeatureNodeContainer.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/LineSelection.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/MementoHelper.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/MultiLanguageText.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/NameHelper.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/TextHelper.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizards/AbstractSpecificReferenceWizardPage.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizards/BookDetailsWizardPage.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizards/NewGenericReferenceWizardPage.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizards/NewNameWizard.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/AbstractPostOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeAcceptedTaxonToSynonymOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeConceptRelationshipTypeOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeConceptToSynonymOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeDescriptionElementType.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeHomotypicGroupOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeSynonymToAcceptedTaxonOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeSynonymToConceptOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeSynonymToHomotypicalGroupBasionymOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeSynonymToMisapplicationOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateConceptRelationOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateImageOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateNameRelationOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateSynonymInExistingHomotypicalGroupOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateSynonymInNewGroupOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateTaxonDescriptionOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateTaxonNodeOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateUserOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteConceptRelationOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteDescriptionElementOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteMisapplicationOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteNameRelationOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteSynonymOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteTreeNodeOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/EditTaxonomicTreeOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/EditUserOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/MoveMediaInListOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/MoveTaxonOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/RemoveImageFromDescriptionElementOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/SaveClassificationOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/SwapSynonymAndAcceptedOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ToggleUserEnablementOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/parser/ParseHandler.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/DefaultFeatureTreePreferenecs.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/FeatureTreePreferences.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/MatchingPreferences.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/TaxonomicEditorGeneralPreferences.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/TermPreferenceUtil.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/matching/AbstractMatchingPreferences.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/matching/NonViralNameMatchingPreference.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/matching/ReferenceMatchingPreference.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/matching/TeamOrPersonMatchingPreference.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/AbstractMenuPreferences.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/DefinedTermBaseContentProvider.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/DefinedTermBaseLabelProvider.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/ExtensionTypeMenuPreferences.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/FeatureMenuPreferences.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/MarkerTypeMenuPreferences.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NamedAreaTypeMenuPreferences.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/PresenceAbsenceMenuPreferences.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/PreservationMethodMenuPreferences.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/StageMenuPreferences.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/VocabularyTermWizard.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/VocabularyTermWizardPage.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/ContextManager.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/LoginManager.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/StoreStateManager.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/StoreUtil.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/TermStore.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/internal/TaxeditorStorePlugin.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/user/handler/CreateUserHandler.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/user/handler/EditUserHandler.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/user/handler/ToggleUserEnablementHandler.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/user/view/UserManagerContentProvider.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/user/view/UserManagerLabelProvider.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/user/view/UserManagerView.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/user/wizard/UserWizard.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/user/wizard/UserWizardPage.java

index 5318cef674bdccda717e14279e857512ee8e4711..c6b5ac7d10a68f06c8a3301bf300c1d1ab057d05 100644 (file)
@@ -874,7 +874,6 @@ taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSo
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceTypeSelectionWizardPage.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceWizard.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/LoginDialog.java -text
-taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/NewReferenceInputDialog.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/UriDialog.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableFeaturesWizard.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableFeaturesWizardPage.java -text
@@ -886,6 +885,7 @@ taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/featuretree/FeatureTreeLabe
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/featuretree/SelectFeatureTreeWizard.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/featuretree/SelectFeatureTreeWizardPage.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/handler/ShowDataSourceViewHandler.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/handler/ShowErrorViewHandler.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/handler/ShowLoginWindowHandler.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/handler/ShowUserManagerViewHandler.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/AbstractIOHandler.java -text
index 4df94b2c8b8e84d3ca4653f8ad80fd2752802793..53c1c5d2376dafc1246881948d4d1091d28d1fc9 100644 (file)
@@ -39,7 +39,8 @@ Export-Package: dbscripts,
 Require-Bundle: org.eclipse.osgi,
  eu.etaxonomy.cdmlib,
  org.eclipse.ui,
- org.eclipse.jface.text
+ org.eclipse.jface.text,
+ org.eclipse.pde.runtime
 Import-Package: junit.framework,
  org.eclipse.core.commands,
  org.eclipse.core.commands.operations,
index bfd142930e558827fbd82cd1bc8245985a3bafb0..25b6231b23bfe6c233bf9c6fd278b7edcfb4cf94 100644 (file)
             name="User Manager"
             restorable="true">
       </view>
+      <view  
+                       name="Progress View"  
+                       icon="icons/pview.gif"  
+                       category="org.eclipse.ui"  
+                       class="org.eclipse.ui.ExtensionFactory:progressView"  
+                       id="org.eclipse.ui.views.ProgressView">  
+               </view>
+               <view  
+                       name="Error View"  
+                       icon="icons/pview.gif"  
+                       category="org.eclipse.ui"  
+                       class="org.eclipse.ui.ExtensionFactory:logView"  
+                       id="org.eclipse.ui.views.LogView">  
+               </view>  
    </extension>
    <extension
          point="org.eclipse.ui.menus">
                   label="User Manager"
                   style="push">
             </command>
+            <command
+                  commandId="eu.etaxonomy.taxeditor.store.operations.showErrorView"
+                  label="Error"
+                  style="push">
+            </command>
          </menu>
          <command
                commandId="eu.etaxonomy.taxeditor.store.operations.showLoginWindow"
             id="eu.etaxonomy.taxeditor.store.operations.showUserManagerView"
             name="Show User Manager View">
       </command>
+      <command
+               defaultHandler="eu.etaxonomy.taxeditor.handler.ShowErrorViewHandler"
+            id="eu.etaxonomy.taxeditor.store.operations.showErrorView"
+            name="Show Error View">
+      </command>
       <command
             defaultHandler="eu.etaxonomy.taxeditor.handler.ShowLoginWindowHandler"
             id="eu.etaxonomy.taxeditor.store.operations.showLoginWindow"
            name="testCategory">
      </category>
        </extension>
-       <extension  
-               point="org.eclipse.ui.views">  
-               <view  
-                       name="Progress View"  
-                       icon="icons/pview.gif"  
-                       category="org.eclipse.ui"  
-                       class="org.eclipse.ui.ExtensionFactory:progressView"  
-                       id="org.eclipse.ui.views.ProgressView">  
-               </view>  
-       </extension>
 <extension
             point="org.eclipse.ui.themes">
          <themeElementCategory
index 0d755659903c1f5d97e5a18fbdb691362efc2bde..be84a25c554c198f00461c14653936aaeec06c91 100644 (file)
@@ -30,9 +30,7 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.StoreUtil;\r
 import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;\r
 \r
-public class CdmDataSourceRepository{\r
-       private static final Logger logger = Logger\r
-                       .getLogger(CdmDataSourceRepository.class);\r
+public class CdmDataSourceRepository{;\r
 \r
        public static final String TAG_DATASOURCE = "tagDataSource";\r
        private static final String CURRENT_DATASOURCE = "currentDataSource";\r
@@ -63,7 +61,7 @@ public class CdmDataSourceRepository{
                        try {\r
                                dataSources.add(CdmPersistentDataSource.NewInstance(dataSource.getName()));\r
                        } catch (DataSourceNotFoundException e) {\r
-                               logger.error("Could not find dataSource", e);\r
+                               StoreUtil.error(CdmDataSourceRepository.class, "Could not find dataSource", e);\r
                        }\r
                }\r
                \r
@@ -80,7 +78,7 @@ public class CdmDataSourceRepository{
                                        return CdmPersistentDataSource.NewInstance(dataSource.getName());\r
                                }\r
                        } catch (DataSourceNotFoundException e) {\r
-                               logger.error("Could not find dataSource", e);\r
+                               StoreUtil.error(CdmDataSourceRepository.class, "Could not find dataSource", e);\r
                        }\r
                }\r
                \r
@@ -150,7 +148,7 @@ public class CdmDataSourceRepository{
                try {\r
                        return CdmPersistentDataSource.update(strDataSourceName, dataSource);\r
                } catch (Exception e) {\r
-                       logger.error("Error updating datasource", e);\r
+                       StoreUtil.error(CdmDataSourceRepository.class, "Error updating datasource", e);\r
                }\r
                return null;\r
        }\r
index d6d26d740956cecccb10962ac283925012d55e89..a8253e756d3a3339eb9d3beaeee668e63023bc8f 100644 (file)
 
 package eu.etaxonomy.taxeditor.datasource.handler;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.handlers.HandlerUtil;
 
 import eu.etaxonomy.taxeditor.datasource.view.CdmDataSourceViewPart;
@@ -29,8 +27,6 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
  * @version 1.0
  */
 abstract class AbstractDataSourceHandler extends AbstractHandler {
-       private static final Logger logger = Logger
-                       .getLogger(AbstractDataSourceHandler.class);
 
        /* (non-Javadoc)
         * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
index 154c7c569c217fddeff0c95f816e166eaf9dd3ec..6588d794d17f60a524093ccd01e1ab6345e55f2c 100644 (file)
@@ -37,7 +37,7 @@ public class ChangeConnectionHandler extends AbstractHandler {
                        CdmMetaDataAwareDataSourceContainer container = (CdmMetaDataAwareDataSourceContainer) ((IStructuredSelection) selection).getFirstElement();
                        
                        if(!container.isRunning()){
-                               StoreUtil.warningDialog("Chosen datasource is not available", "This could mean that either the database server is " +
+                               StoreUtil.warningDialog("Chosen datasource is not available", this, "This could mean that either the database server is " +
                                                "not running or the machine is not reachable.\n\n" +
                                                "Please also make sure that you are connected to the network when trying to connect to a remote datasource.");
                                return null;
index 6f6574308d2462357c2a8b14759e415d0cee8fe1..dd5407358466687105a97acb871683814571e450 100644 (file)
 
 package eu.etaxonomy.taxeditor.datasource.handler;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IViewPart;
 import org.eclipse.ui.handlers.HandlerUtil;
 
-import eu.etaxonomy.cdm.database.CdmDataSource;
 import eu.etaxonomy.taxeditor.datasource.view.CdmDataSourceViewPart;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
@@ -30,8 +27,6 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
  * @version 1.0
  */
 public class CloseConnectionHandler extends AbstractHandler {
-       private static final Logger logger = Logger
-                       .getLogger(CloseConnectionHandler.class);
 
        /* (non-Javadoc)
         * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
index f6f3c21e6564d9c3ecbaf52b44fb2215181ad3cb..04dc5a95c1b7b98c0926d7ced42fa15b0013528a 100644 (file)
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.datasource.handler;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.expressions.PropertyTester;
 import org.eclipse.jface.viewers.IStructuredSelection;
 
@@ -22,8 +21,6 @@ import eu.etaxonomy.taxeditor.datasource.view.CdmMetaDataAwareDataSourceContaine
  * @version 1.0
  */
 public class DataSourceMenuPropertyTester extends PropertyTester {
-       private static final Logger logger = Logger
-                       .getLogger(DataSourceMenuPropertyTester.class);
 
        private static final String COMPATIBLE = "isCompatible";
 
index ba05eea47d810c5596fdd32d73a0e85f4402f7e5..736b4065c79de07673a3fff10d60c9fcc33ced49 100644 (file)
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.datasource.handler;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
@@ -31,9 +30,7 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
  * @version 1.0
  */
 public class UpdateDataSourceHandler extends AbstractDataSourceHandler {
-       private static final Logger logger = Logger
-                       .getLogger(UpdateDataSourceHandler.class);
-
+       
        /* (non-Javadoc)
         * @see eu.etaxonomy.taxeditor.datasource.handler.AbstractDataSourceHandler#specificExecute(org.eclipse.core.commands.ExecutionEvent)
         */
index 3745c4dbf74bcfb8028428d28539c0c352f1fde8..7b43e41bf7d44ec7c08ee0738144937b7d3dbbd0 100644 (file)
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.datasource.view;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.swt.graphics.Image;
@@ -26,10 +25,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @version 1.0
  */
 public class CdmDataSourceLabelProvider extends LabelProvider implements ITableLabelProvider {
-       private static final Logger logger = Logger
-                       .getLogger(CdmDataSourceLabelProvider.class);
-       
-       
        
        /*
         * (non-Javadoc)
index ba63798335affaace5a810c87330b7489eaf982a..3e30145dfaaa4a9edde1894fcde460fb850dafd4 100644 (file)
@@ -14,7 +14,6 @@ import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.commands.Command;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.commands.NotEnabledException;
@@ -121,8 +120,6 @@ public class CdmDataSourceViewPart extends ViewPart{
                }
        }
        
-       private static final Logger logger = Logger.getLogger(CdmDataSourceViewPart.class);
-       
        public static String ID = "eu.etaxonomy.taxeditor.store.datasource.datasourceView";
        
        private TableViewer viewer;
@@ -190,13 +187,13 @@ public class CdmDataSourceViewPart extends ViewPart{
                                                        try {
                                                                handlerService.executeCommand(commandId, null);
                                                        } catch (ExecutionException e) {
-                                                               logger.error(e);
+                                                               StoreUtil.error(this.getClass(), e);
                                                        } catch (NotDefinedException e) {
-                                                               logger.error(e);
+                                                               StoreUtil.error(this.getClass(), e);
                                                        } catch (NotEnabledException e) {
-                                                               logger.error(e);
+                                                               StoreUtil.error(this.getClass(), e);
                                                        } catch (NotHandledException e) {
-                                                               logger.error(e);
+                                                               StoreUtil.error(this.getClass(), e);
                                                        }
                                                }
                                        }
@@ -229,9 +226,9 @@ public class CdmDataSourceViewPart extends ViewPart{
                try {
                        StoreUtil.runInUI(new DataSourceRunnable(Display.getCurrent(), CdmDataSourceRepository.getAll()), null);
                } catch (InvocationTargetException e) {
-                       logger.error(e);
+                       StoreUtil.error(this.getClass(), e);
                } catch (InterruptedException e) {
-                       logger.error(e);
+                       StoreUtil.error(this.getClass(), e);
                }
        }
 
index c4f346bc17cf75242392c9220630e82650362679..75c3816d0a59fd87379e76c749e32297fdd55a99 100644 (file)
@@ -14,7 +14,6 @@ import java.sql.SQLException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
@@ -25,6 +24,7 @@ import org.eclipse.swt.widgets.Display;
 import eu.etaxonomy.cdm.database.ICdmDataSource;
 import eu.etaxonomy.cdm.model.common.CdmMetaData;
 import eu.etaxonomy.cdm.model.common.CdmMetaData.MetaDataPropertyName;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
 
 /**
  * @author n.hoffmann
@@ -32,8 +32,6 @@ import eu.etaxonomy.cdm.model.common.CdmMetaData.MetaDataPropertyName;
  * @version 1.0
  */
 public class CdmMetaDataAwareDataSourceContainer {
-       private static final Logger logger = Logger
-                       .getLogger(CdmMetaDataAwareDataSourceContainer.class);
        
        private class MetaDataJob extends Job{
 
@@ -119,11 +117,11 @@ public class CdmMetaDataAwareDataSourceContainer {
                                        }               
                                        dataSource.closeOpenConnections();
                                } catch (SQLException e) {
-                                       logger.error("SQLException when trying to access: " + dataSource.getName() + ". " + e.getMessage());
+                                       StoreUtil.error(this.getClass(), "SQLException when trying to access: " + dataSource.getName() + ". ", e);
                                } 
                        }
                } catch (Exception e) {
-                       logger.error(e);
+                       StoreUtil.error(this.getClass(), e);
                }
        }
        
index eff62b3509c65991d856e67c1db9d10e200bebbf..73e8505faa4d49392d78a990b66909933875c35d 100644 (file)
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.datasource.wizard;
 
-import org.apache.log4j.Logger;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -28,10 +27,6 @@ import eu.etaxonomy.cdm.database.ICdmDataSource;
  * @version 1.0
  */
 public class CdmDataSourceMySQLWizardPage extends CdmDataSourceCredentialsWizardPage {
-
-
-       private static final Logger logger = Logger
-                       .getLogger(CdmDataSourceMySQLWizardPage.class);
        
        private Text text_port;
        private Text text_server;
index 8a9b9d0421aa8e915b582c2ee1e0d060d970e43b..69ee36cee543c0a555a9b1417b6347ea073bae54 100644 (file)
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.datasource.wizard;
 
-import org.apache.log4j.Logger;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -29,10 +28,6 @@ import eu.etaxonomy.cdm.database.ICdmDataSource;
  */
 public class CdmDataSourceSQLServerWizardPage extends CdmDataSourceCredentialsWizardPage {
 
-
-       private static final Logger logger = Logger
-                       .getLogger(CdmDataSourceSQLServerWizardPage.class);
-       
        private Text text_port;
        private Text text_server;
 
index 69d0639d2338c485362b830e1f7a94fdfffedd22..325f2d8ed3a00d3b7005a988d74eed0615b8628e 100644 (file)
@@ -22,10 +22,8 @@ import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
@@ -33,8 +31,6 @@ import eu.etaxonomy.cdm.database.DatabaseTypeEnum;
 import eu.etaxonomy.cdm.database.ICdmDataSource;
 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
 import eu.etaxonomy.taxeditor.datasource.CdmDataSourceRepository;
-import eu.etaxonomy.taxeditor.model.NomenclaturalCodeHelper;
-import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 
 /**
  * @author n.hoffmann
index e69da00299f43d1eac5e58f711a0b62bc2b10e3e..90bbca88aafe75aaf0eef1461727ddc2466c026f 100644 (file)
@@ -112,13 +112,13 @@ public class LoginDialog extends Dialog {
                        CdmStore.getLoginManager().authenticate(token);                 
                }catch(BadCredentialsException e){
                        logger.error("Bad credentials", e);
-                       StoreUtil.warningDialog("Could not authenticate", "Could not authenticate. Reason: Bad Credentials.");
+                       StoreUtil.warningDialog("Could not authenticate", this, "Could not authenticate. Reason: Bad Credentials.");
                }catch(LockedException e){
                        logger.error("Account is locked", e);
-                       StoreUtil.warningDialog("Could not authenticate", "Could not authenticate. Reason: Account is locked.");
+                       StoreUtil.warningDialog("Could not authenticate", this, "Could not authenticate. Reason: Account is locked.");
                }catch(IllegalArgumentException e){
                        logger.error("Null argument for either user or password", e);
-                       StoreUtil.warningDialog("Could not authenticate", "Could not authenticate. Reason: Username and/or Password empty.");
+                       StoreUtil.warningDialog("Could not authenticate", this, "Could not authenticate. Reason: Username and/or Password empty.");
                }
                
                super.okPressed();
diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/NewReferenceInputDialog.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/NewReferenceInputDialog.java
deleted file mode 100644 (file)
index 9c7899c..0000000
+++ /dev/null
@@ -1,403 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2000, 2008 IBM Corporation and others.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     IBM Corporation - initial API and implementation\r
- *******************************************************************************/\r
-package eu.etaxonomy.taxeditor.dialogs;\r
-\r
-import java.util.Arrays;\r
-import java.util.List;\r
-\r
-import org.apache.log4j.Logger;\r
-import org.eclipse.jface.dialogs.Dialog;\r
-import org.eclipse.jface.dialogs.IDialogConstants;\r
-import org.eclipse.jface.dialogs.IInputValidator;\r
-import org.eclipse.jface.resource.StringConverter;\r
-import org.eclipse.swt.SWT;\r
-import org.eclipse.swt.events.ModifyEvent;\r
-import org.eclipse.swt.events.ModifyListener;\r
-import org.eclipse.swt.layout.GridData;\r
-import org.eclipse.swt.widgets.Button;\r
-import org.eclipse.swt.widgets.Combo;\r
-import org.eclipse.swt.widgets.Composite;\r
-import org.eclipse.swt.widgets.Control;\r
-import org.eclipse.swt.widgets.Label;\r
-import org.eclipse.swt.widgets.Shell;\r
-import org.eclipse.swt.widgets.Text;\r
-\r
-import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
-import eu.etaxonomy.cdm.model.reference.ReferenceFactory;\r
-import eu.etaxonomy.cdm.model.reference.ReferenceType;\r
-\r
-/**\r
- * A simple input dialog for soliciting an input string from the user.\r
- * <p>\r
- * This concrete dialog class can be instantiated as is, or further subclassed as\r
- * required.\r
- * </p>\r
- * \r
- * TODO Replace this with a proper wizard that allows for sophisticated reference editing\r
- */\r
-public class NewReferenceInputDialog extends Dialog {\r
-       private static final Logger logger = Logger\r
-                       .getLogger(NewReferenceInputDialog.class);\r
-       \r
-    /**\r
-     * The title of the dialog.\r
-     */\r
-    private String title;\r
-\r
-    /**\r
-     * The message to display, or <code>null</code> if none.\r
-     */\r
-    private String message;\r
-\r
-    /**\r
-     * The input value; the empty string by default.\r
-     */\r
-    private String value = "";//$NON-NLS-1$\r
-\r
-    /**\r
-     * The input validator, or <code>null</code> if none.\r
-     */\r
-    private IInputValidator validator;\r
-\r
-    /**\r
-     * Ok button widget.\r
-     */\r
-    private Button okButton;\r
-\r
-    /**\r
-     * Input text widget.\r
-     */\r
-    private Text refText;\r
-\r
-    /**\r
-     * Error message label widget.\r
-     */\r
-    private Text errorMessageText;\r
-    \r
-    /**\r
-     * Error message string.\r
-     */\r
-    private String errorMessage;\r
-\r
-       private String message2;\r
-\r
-       private ReferenceBase reference = null;\r
-\r
-    /**\r
-     * Creates an input dialog with OK and Cancel buttons. Note that the dialog\r
-     * will have no visual representation (no widgets) until it is told to open.\r
-     * <p>\r
-     * Note that the <code>open</code> method blocks for input dialogs.\r
-     * </p>\r
-     * \r
-     * @param parentShell\r
-     *            the parent shell, or <code>null</code> to create a top-level\r
-     *            shell\r
-     * @param dialogTitle\r
-     *            the dialog title, or <code>null</code> if none\r
-     * @param dialogMessage\r
-     *            the dialog message, or <code>null</code> if none\r
-     * @param initialValue\r
-     *            the initial input value, or <code>null</code> if none\r
-     *            (equivalent to the empty string)\r
-     * @param validator\r
-     *            an input validator, or <code>null</code> if none\r
-     */\r
-    public NewReferenceInputDialog(Shell parentShell) {\r
-        super(parentShell);\r
-        this.title = "Create reference";\r
-        this.message = "Choose a reference type:";\r
-        this.message2 = "Enter a title cache:";\r
-    }\r
-\r
-    /*\r
-     * (non-Javadoc) Method declared on Dialog.\r
-     */\r
-    protected void buttonPressed(int buttonId) {\r
-        if (buttonId == IDialogConstants.OK_ID) {\r
-               createReference();\r
-            value = refText.getText();\r
-        } else {\r
-            value = null;\r
-        }\r
-        super.buttonPressed(buttonId);\r
-    }\r
-\r
-    /**\r
-        * \r
-        */\r
-       private void createReference() {\r
-               String key = refCombo.getText();\r
-               \r
-               // TODO replace w more generic method when cdmlib matures accordingly\r
-               if  (ReferenceType.Article.getMessage().equals(key)) {\r
-                       reference = ReferenceFactory.newArticle();\r
-               }\r
-               else if  (ReferenceType.Book.getMessage().equals(key)) {\r
-                       reference = ReferenceFactory.newBook();\r
-               }\r
-               else if  (ReferenceType.BookSection.getMessage().equals(key)) {\r
-                       reference = ReferenceFactory.newBookSection();\r
-               }\r
-               else if  (ReferenceType.CdDvd.getMessage().equals(key)) {\r
-                       reference = ReferenceFactory.newCdDvd();\r
-               }\r
-               else if  (ReferenceType.Database.getMessage().equals(key)) {\r
-                       reference = ReferenceFactory.newDatabase();\r
-               }\r
-               else if  (ReferenceType.Generic.getMessage().equals(key)) {\r
-                       reference = ReferenceFactory.newGeneric();\r
-               }\r
-               else if  (ReferenceType.InProceedings.getMessage().equals(key)) {\r
-                       reference = ReferenceFactory.newInProceedings();\r
-               }\r
-               else if  (ReferenceType.Journal.getMessage().equals(key)) {\r
-                       reference = ReferenceFactory.newJournal();\r
-               }\r
-               else if  (ReferenceType.Map.getMessage().equals(key)) {\r
-                       reference = ReferenceFactory.newMap();\r
-               }\r
-               else if  (ReferenceType.Patent.getMessage().equals(key)) {\r
-                       reference = ReferenceFactory.newPatent();\r
-               }\r
-               else if  (ReferenceType.PersonalCommunication.getMessage().equals(key)) {\r
-                       reference = ReferenceFactory.newPersonalCommunication();\r
-               }\r
-               else if  (ReferenceType.PrintSeries.getMessage().equals(key)) {\r
-                       reference = ReferenceFactory.newPrintSeries();\r
-               }\r
-               else if  (ReferenceType.Proceedings.getMessage().equals(key)) {\r
-                       reference = ReferenceFactory.newProceedings();\r
-               }\r
-               else if  (ReferenceType.Report.getMessage().equals(key)) {\r
-                       reference = ReferenceFactory.newReport();\r
-               }\r
-               else if  (ReferenceType.Thesis.getMessage().equals(key)) {\r
-                       reference = ReferenceFactory.newThesis();\r
-               }\r
-               else if  (ReferenceType.WebPage.getMessage().equals(key)) {\r
-                       reference = ReferenceFactory.newWebPage();\r
-               }\r
-               \r
-               // fill the cache\r
-               if (reference != null) {\r
-                       reference.setTitleCache(refText.getText(), true);\r
-               }\r
-       }\r
-\r
-       /*\r
-     * (non-Javadoc)\r
-     * \r
-     * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)\r
-     */\r
-    protected void configureShell(Shell shell) {\r
-        super.configureShell(shell);\r
-        if (title != null) {\r
-                       shell.setText(title);\r
-               }\r
-    }\r
-\r
-    /*\r
-     * (non-Javadoc)\r
-     * \r
-     * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite)\r
-     */\r
-    protected void createButtonsForButtonBar(Composite parent) {\r
-        // create OK and Cancel buttons by default\r
-        okButton = createButton(parent, IDialogConstants.OK_ID,\r
-                IDialogConstants.OK_LABEL, true);\r
-        createButton(parent, IDialogConstants.CANCEL_ID,\r
-                IDialogConstants.CANCEL_LABEL, false);\r
-        //do this here because setting the text will set enablement on the ok\r
-        // button\r
-        refText.setFocus();\r
-        if (value != null) {\r
-            refText.setText(value);\r
-            refText.selectAll();\r
-        }\r
-    }\r
-\r
-       private Combo refCombo;\r
-\r
-       private List<ReferenceType> refTypes;\r
-    \r
-    /*\r
-     * (non-Javadoc) Method declared on Dialog.\r
-     */\r
-    protected Control createDialogArea(Composite parent) {\r
-        // create composite\r
-        Composite composite = (Composite) super.createDialogArea(parent);\r
-        // create message\r
-        Label label = new Label(composite, SWT.WRAP);\r
-        label.setText(message);\r
-        GridData data = new GridData(GridData.GRAB_HORIZONTAL\r
-                | GridData.GRAB_VERTICAL | GridData.HORIZONTAL_ALIGN_FILL\r
-                | GridData.VERTICAL_ALIGN_CENTER);\r
-        data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);\r
-        label.setLayoutData(data);\r
-        label.setFont(parent.getFont());\r
-        refCombo = new Combo(composite, SWT.NONE | SWT.READ_ONLY);\r
-        refCombo.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL\r
-                | GridData.HORIZONTAL_ALIGN_FILL));\r
-        refCombo.addModifyListener(new ModifyListener() {\r
-            public void modifyText(ModifyEvent e) {\r
-                validateInput();\r
-            }\r
-        });\r
-        // create message\r
-        Label label2 = new Label(composite, SWT.WRAP);\r
-        label2.setText(message2);\r
-        GridData data2 = new GridData(GridData.GRAB_HORIZONTAL\r
-                | GridData.GRAB_VERTICAL | GridData.HORIZONTAL_ALIGN_FILL\r
-                | GridData.VERTICAL_ALIGN_CENTER);\r
-        data2.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);\r
-        label2.setLayoutData(data);\r
-        label2.setFont(parent.getFont());\r
-        // create text\r
-        refText = new Text(composite, getInputTextStyle());\r
-        refText.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL\r
-                | GridData.HORIZONTAL_ALIGN_FILL));\r
-        refText.addModifyListener(new ModifyListener() {\r
-            public void modifyText(ModifyEvent e) {\r
-                validateInput();\r
-            }\r
-        });\r
-        errorMessageText = new Text(composite, SWT.READ_ONLY | SWT.WRAP);\r
-        errorMessageText.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL\r
-                | GridData.HORIZONTAL_ALIGN_FILL));\r
-        errorMessageText.setBackground(errorMessageText.getDisplay()\r
-                .getSystemColor(SWT.COLOR_WIDGET_BACKGROUND));\r
-        // Set the error message text\r
-        // See https://bugs.eclipse.org/bugs/show_bug.cgi?id=66292\r
-        setErrorMessage(errorMessage);\r
-        applyDialogFont(composite);\r
-        \r
-        populateReferences();\r
-        \r
-        return composite;\r
-    }\r
-\r
-    /**\r
-        * \r
-        */\r
-       private void populateReferences() {\r
-               refTypes = Arrays.asList(ReferenceType.values());\r
-               for (ReferenceType type : refTypes) {\r
-                       refCombo.add(type.getMessage());\r
-               }\r
-               refCombo.select(0);\r
-       }\r
-\r
-       /**\r
-     * Returns the error message label.\r
-     * \r
-     * @return the error message label\r
-     * @deprecated use setErrorMessage(String) instead\r
-     */\r
-    protected Label getErrorMessageLabel() {\r
-        return null;\r
-    }\r
-\r
-    /**\r
-     * Returns the ok button.\r
-     * \r
-     * @return the ok button\r
-     */\r
-    protected Button getOkButton() {\r
-        return okButton;\r
-    }\r
-\r
-    /**\r
-     * Returns the text area.\r
-     * \r
-     * @return the text area\r
-     */\r
-    protected Text getText() {\r
-        return refText;\r
-    }\r
-\r
-    /**\r
-     * Returns the validator.\r
-     * \r
-     * @return the validator\r
-     */\r
-    protected IInputValidator getValidator() {\r
-        return validator;\r
-    }\r
-\r
-    /**\r
-     * Validates the input.\r
-     * <p>\r
-     * The default implementation of this framework method delegates the request\r
-     * to the supplied input validator object; if it finds the input invalid,\r
-     * the error message is displayed in the dialog's message line. This hook\r
-     * method is called whenever the text changes in the input field.\r
-     * </p>\r
-     */\r
-    protected void validateInput() {\r
-        String errorMessage = null;\r
-        if (validator != null) {\r
-            errorMessage = validator.isValid(refText.getText());\r
-        }\r
-        // Bug 16256: important not to treat "" (blank error) the same as null\r
-        // (no error)\r
-        setErrorMessage(errorMessage);\r
-    }\r
-\r
-    /**\r
-     * Sets or clears the error message.\r
-     * If not <code>null</code>, the OK button is disabled.\r
-     * \r
-     * @param errorMessage\r
-     *            the error message, or <code>null</code> to clear\r
-     * @since 3.0\r
-     */\r
-    public void setErrorMessage(String errorMessage) {\r
-       this.errorMessage = errorMessage;\r
-       if (errorMessageText != null && !errorMessageText.isDisposed()) {\r
-               errorMessageText.setText(errorMessage == null ? " \n " : errorMessage); //$NON-NLS-1$\r
-               // Disable the error message text control if there is no error, or\r
-               // no error text (empty or whitespace only).  Hide it also to avoid\r
-               // color change.\r
-               // See https://bugs.eclipse.org/bugs/show_bug.cgi?id=130281\r
-               boolean hasError = errorMessage != null && (StringConverter.removeWhiteSpaces(errorMessage)).length() > 0;\r
-               errorMessageText.setEnabled(hasError);\r
-               errorMessageText.setVisible(hasError);\r
-               errorMessageText.getParent().update();\r
-               // Access the ok button by id, in case clients have overridden button creation.\r
-               // See https://bugs.eclipse.org/bugs/show_bug.cgi?id=113643\r
-               Control button = getButton(IDialogConstants.OK_ID);\r
-               if (button != null) {\r
-                       button.setEnabled(errorMessage == null);\r
-               }\r
-       }\r
-    }\r
-    \r
-       /**\r
-        * Returns the style bits that should be used for the input text field.\r
-        * Defaults to a single line entry. Subclasses may override.\r
-        * \r
-        * @return the integer style bits that should be used when creating the\r
-        *         input text\r
-        * \r
-        * @since 3.4\r
-        */\r
-       protected int getInputTextStyle() {\r
-               return SWT.SINGLE | SWT.BORDER;\r
-       }\r
-\r
-       /**\r
-        * @return\r
-        */\r
-       public ReferenceBase getReference() {           \r
-               return reference;\r
-       }\r
-}\r
index 144a2a27006e078baa4b565b2e04724fad78a253..f79ab2d5d348ff946b5e74a34787d79dd966ec30 100644 (file)
@@ -12,7 +12,6 @@ package eu.etaxonomy.taxeditor.featuretree;
 
 import java.util.Set;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.wizard.Wizard;
 
 import eu.etaxonomy.cdm.model.description.Feature;
@@ -24,8 +23,6 @@ import eu.etaxonomy.cdm.model.description.FeatureTree;
  * @version 1.0
  */
 public class AvailableFeaturesWizard extends Wizard {
-       private static final Logger logger = Logger
-                       .getLogger(AvailableFeaturesWizard.class);
        
        private FeatureTree featureTree;
 
index 88fddbdfd8bea13c764a9b9b64cb362a8e87b3fe..65cab61696a497ad1c63b9abfda5546a1100eb90 100644 (file)
@@ -13,7 +13,6 @@ package eu.etaxonomy.taxeditor.featuretree;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.viewers.CheckboxTableViewer;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
@@ -34,9 +33,6 @@ import eu.etaxonomy.taxeditor.preference.menu.DefinedTermBaseLabelProvider;
  */
 public class AvailableFeaturesWizardPage extends WizardPage {
 
-
-       private static final Logger logger = Logger
-                       .getLogger(AvailableFeaturesWizardPage.class);
        private CheckboxTableViewer viewer;
 
        protected AvailableFeaturesWizardPage(FeatureTree featureTree) {
index 44f5dda0e77e8b870a3ba5e61d59afe3600dc7bb..36633ed700aaddec3eb929084e34dcc2f054b7dc 100644 (file)
@@ -12,7 +12,6 @@ package eu.etaxonomy.taxeditor.featuretree;
 
 import java.util.Collection;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -52,8 +51,6 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
  */
 public class EditFeatureTreeWizardPage extends WizardPage implements ModifyListener, ISelectionChangedListener{
 
-       private static final Logger logger = Logger
-                       .getLogger(EditFeatureTreeWizardPage.class);
        private TreeViewer viewer;
        private Label label_title;
        private Text text_title;
@@ -275,7 +272,7 @@ public class EditFeatureTreeWizardPage extends WizardPage implements ModifyListe
                        // cannot drop a feature node onto itself
                        for (FeatureNode droppedNode : droppedNodes) {
                                if (droppedNode == null){
-                                       StoreUtil.warningDialog("Operation not supported yet", "We are currently unable to change the order of freshly created " +
+                                       StoreUtil.warningDialog("Operation not supported yet", this, "We are currently unable to change the order of freshly created " +
                                                        "feature trees nodes. Please close and reopen the dialog to change the order of features.");
                                        return false;
                                }
index f914bccc853ed0ab7c2ada67bdafec1ee43cb350..11db42d78384fb40dffaad6f81d56e15d1f819b3 100644 (file)
@@ -20,7 +20,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
-import org.apache.log4j.Logger;
 import org.eclipse.swt.dnd.ByteArrayTransfer;
 import org.eclipse.swt.dnd.TransferData;
 
@@ -33,8 +32,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @version 1.0
  */
 public class FeatureNodeTransfer extends ByteArrayTransfer {
-       private static final Logger logger = Logger
-                       .getLogger(FeatureNodeTransfer.class);
 
        private static FeatureNodeTransfer instance = new FeatureNodeTransfer();
        private static final String TYPE_NAME = "featureNode-transfer-format";
index fe7b8d2c159b0afc5f19c437788a940e54284b65..e427fe3a451fc473cc3f77ba65e3d4d9b3bc64c5 100644 (file)
@@ -12,7 +12,6 @@ package eu.etaxonomy.taxeditor.featuretree;
 
 import java.util.List;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.Viewer;
 
@@ -25,8 +24,6 @@ import eu.etaxonomy.cdm.model.description.FeatureTree;
  * @version 1.0
  */
 public class FeatureTreeContentProvider implements ITreeContentProvider {
-       private static final Logger logger = Logger
-                       .getLogger(FeatureTreeContentProvider.class);
 
        /* (non-Javadoc)
         * @see org.eclipse.jface.viewers.IContentProvider#dispose()
index 0497be43c390e70036f8413da007c0365868c435..a2daf2487fe7bfe5c174262a64e483e24d0c9166 100644 (file)
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.featuretree;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.wizard.Wizard;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
@@ -23,9 +22,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @version 1.0
  */
 public class FeatureTreeEditorWizard extends Wizard {
-
-       private static final Logger logger = Logger
-                       .getLogger(FeatureTreeEditorWizard.class);
        
        private SelectFeatureTreeWizardPage selectFeatureTreePage;
        private EditFeatureTreeWizardPage editFeatureTreePage;
index 13d819b05c3360b7c09678e4ddcaa2fb6e22f00b..839bf2c8c6c943b5390432d6787a94ef5da2ebf9 100644 (file)
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.featuretree;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.viewers.LabelProvider;
 
 import eu.etaxonomy.cdm.model.description.Feature;
@@ -23,8 +22,6 @@ import eu.etaxonomy.cdm.model.description.FeatureTree;
  * @version 1.0
  */
 public class FeatureTreeLabelProvider extends LabelProvider {
-       private static final Logger logger = Logger
-                       .getLogger(FeatureTreeLabelProvider.class);
        
        private Feature feature;
                
index 84864a0d042b47e66569ebf61ee71ade1a2ebf27..7729cc64dae495269f7b380b6a9c3348c1facfaa 100644 (file)
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.featuretree;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.wizard.Wizard;
 
 /**
@@ -19,8 +18,6 @@ import org.eclipse.jface.wizard.Wizard;
  * @version 1.0
  */
 public class SelectFeatureTreeWizard extends Wizard {
-       private static final Logger logger = Logger
-                       .getLogger(SelectFeatureTreeWizard.class);
 
        public static final String PAGE_NAME = "Select Feature Tree";
        
index 45f4484466fa3fa999a759316b65a228d45e86ec..18f11e114ee6de32a3c6d50a099f631041be0858 100644 (file)
@@ -12,7 +12,6 @@ package eu.etaxonomy.taxeditor.featuretree;
 
 import java.util.List;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.ListViewer;
@@ -41,9 +40,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  */
 public class SelectFeatureTreeWizardPage extends WizardPage implements ISelectionChangedListener, ModifyListener{
 
-
-       private static final Logger logger = Logger
-                       .getLogger(SelectFeatureTreeWizardPage.class);
        private ListViewer viewer;
        private Text text_title;
        private Button button_add;
index 3f878d500e72e0beb920f40b395ffc47a45d111b..4c7ca87f97ec55ee46de99427965c27e6d5ca2ca 100644 (file)
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.handler;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
@@ -19,6 +18,7 @@ import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PartInitException;
 
 import eu.etaxonomy.taxeditor.datasource.view.CdmDataSourceViewPart;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
 
 /**
@@ -27,9 +27,6 @@ import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
  * @version 1.0
  */
 public class ShowDataSourceViewHandler extends AbstractHandler implements IHandler {
-       private static final Logger logger = Logger
-                       .getLogger(ShowDataSourceViewHandler.class);
-
        
        public Object execute(ExecutionEvent event) throws ExecutionException {
                try {
@@ -37,7 +34,7 @@ public class ShowDataSourceViewHandler extends AbstractHandler implements IHandl
                                .getActiveWorkbenchWindow().getActivePage().showView(CdmDataSourceViewPart.ID, 
                                        null, IWorkbenchPage.VIEW_VISIBLE);
                } catch (PartInitException e) {
-                       logger.error("Error opening data source view.", e);
+                       StoreUtil.error(this.getClass(), "Error opening data source view.", e);
                }
                return null;
        }
diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/handler/ShowErrorViewHandler.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/handler/ShowErrorViewHandler.java
new file mode 100644 (file)
index 0000000..9aea8b0
--- /dev/null
@@ -0,0 +1,43 @@
+// $Id$
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package eu.etaxonomy.taxeditor.handler;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.PartInitException;
+
+import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
+
+/**
+ * @author n.hoffmann
+ * @created Oct 13, 2010
+ * @version 1.0
+ */
+public class ShowErrorViewHandler extends AbstractHandler {
+
+       /* (non-Javadoc)
+        * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+        */
+       @Override
+       public Object execute(ExecutionEvent arg0) throws ExecutionException {
+               try {
+                       TaxeditorStorePlugin.getDefault().getWorkbench()
+                               .getActiveWorkbenchWindow().getActivePage().showView("org.eclipse.pde.runtime.LogView", 
+                                       null, IWorkbenchPage.VIEW_VISIBLE);
+               } catch (PartInitException e) {
+                       StoreUtil.error(this.getClass(), e);
+               }
+               return null;
+       }
+}
index 41d5f11dcac820d94f450b2aa03c617227f7725a..f3d26aeed9683a081195119cadb8971daa02f4ad 100644 (file)
@@ -25,8 +25,6 @@ import eu.etaxonomy.taxeditor.dialogs.LoginDialog;
  * @version 1.0
  */
 public class ShowLoginWindowHandler extends AbstractHandler implements IHandler{
-       private static final Logger logger = Logger
-                       .getLogger(ShowLoginWindowHandler.class);
 
        /* (non-Javadoc)
         * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
index 878cb25c66303f14fdf17f4f73e9564767515875..937616978b6d28a599fdfe9f2c0d8db0fd282dfb 100644 (file)
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.handler;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
@@ -18,6 +17,7 @@ import org.eclipse.core.commands.IHandler;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PartInitException;
 
+import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
 import eu.etaxonomy.taxeditor.user.view.UserManagerView;
 
@@ -27,8 +27,6 @@ import eu.etaxonomy.taxeditor.user.view.UserManagerView;
  * @version 1.0
  */
 public class ShowUserManagerViewHandler  extends AbstractHandler implements IHandler{
-       private static final Logger logger = Logger
-                       .getLogger(ShowUserManagerViewHandler.class);
        
        public Object execute(ExecutionEvent event) throws ExecutionException {
                try {
@@ -36,7 +34,7 @@ public class ShowUserManagerViewHandler  extends AbstractHandler implements IHan
                                .getActiveWorkbenchWindow().getActivePage().showView(UserManagerView.ID, 
                                        null, IWorkbenchPage.VIEW_VISIBLE);
                } catch (PartInitException e) {
-                       logger.error("Error opening user management view.", e);
+                       StoreUtil.error(this.getClass(), e);
                }
                return null;
        }
index 3f9b603609c2d0779a66e6843b89452b9385d983..56d24c91a05775228366045486b8dd6cfb7300a3 100644 (file)
@@ -17,7 +17,6 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.progress.IProgressConstants;
 
 import eu.etaxonomy.cdm.api.application.CdmApplicationController;
 import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
@@ -93,10 +92,9 @@ public class ExportHandler extends AbstractIOHandler<IExportConfigurator>{
                                        exporter.invoke(configurator);
                                        monitor.worked(60);
                                }catch(RuntimeException e){
-                                       StoreUtil.errorDialog("Error exporting data", "An error occured while" +
+                                       StoreUtil.errorDialog("Error exporting data", this, "An error occured while" +
                                                        "exporting to destination '" + configurator.getDestinationNameString() + "'.\n" +
-                                                                       "Please check error log for details.");
-                                       logger.error("Error exporting data", e);
+                                                                       "Please check error log for details.", e);
                                }
                                
                                display.asyncExec(new Runnable() {
@@ -133,7 +131,7 @@ public class ExportHandler extends AbstractIOHandler<IExportConfigurator>{
                        case Sdd:
                                return SDDExportConfigurator.NewInstance(null, null, null);
                        default:
-                               StoreUtil.notImplementedMessage();
+                               StoreUtil.notImplementedMessage(this);
                                throw new IllegalArgumentException("Export not supported yet");
                }
        }
index 4b124abefddc227f14d4f1de219497afcf2e55b7..3814988cf83d3135f40c4ee8ffb73a204ae8608f 100644 (file)
@@ -98,10 +98,9 @@ public class ImportHandler extends AbstractIOHandler<IImportConfigurator> {
                                        importer.invoke(configurator);
                                        monitor.worked(60);
                                }catch(RuntimeException e){
-                                       StoreUtil.errorDialog("Error importing data", "An error occured while" +
+                                       StoreUtil.errorDialog("Error importing data", this, "An error occured while" +
                                                        "importing from source '" + configurator.getSourceNameString() + "'.\n" +
-                                                                       "Please check error log for details.");
-                                       logger.error("Error importing data", e);
+                                                                       "Please check error log for details.", e);
                                }
                                
                                display.asyncExec(new Runnable() {
@@ -150,7 +149,7 @@ public class ImportHandler extends AbstractIOHandler<IImportConfigurator> {
                        case Sdd:
                                return SDDImportConfigurator.NewInstance(null, null);
                        default:
-                               StoreUtil.notImplementedMessage();
+                               StoreUtil.notImplementedMessage(this);
                                throw new IllegalArgumentException("Import not supported yet");
                }
        }
index 614aec815493d230d3b03508e89e5d5a8190ff71..e096bf14feae06b3f7f43020d38c1304d6e7928b 100644 (file)
@@ -12,7 +12,6 @@ package eu.etaxonomy.taxeditor.io.wizard;
 
 import java.net.URI;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.ui.IWorkbench;
 
@@ -26,8 +25,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @version 1.0
  */
 public class AbcdImportWizard extends AbstractImportWizard<Abcd206ImportConfigurator> {
-       private static final Logger logger = Logger
-                       .getLogger(AbcdImportWizard.class);
 
        private Abcd206ImportConfigurator configurator;
        private ImportFromFileDataSourceWizardPage dataSourcePage;
index acd0f9b1824b09ab4c7555d938db71dc69a51fe5..a3a800751ac66e8ddf61ce70882ad7c96856f28a 100644 (file)
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.io.wizard;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.ui.IExportWizard;
@@ -22,8 +21,6 @@ import org.eclipse.ui.IWorkbench;
  * @version 1.0
  */
 public class AbstractExcelExportWizard extends Wizard implements IExportWizard {
-       private static final Logger logger = Logger
-                       .getLogger(AbstractExcelExportWizard.class);
 
        /* (non-Javadoc)
         * @see org.eclipse.jface.wizard.Wizard#performFinish()
index 1cc95c6d964c47c20072a6e2969314636d9eb1f0..6827161cf0b2c68916d87f56d0ee9faa1e1b71b8 100644 (file)
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.io.wizard;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.ui.IImportWizard;
@@ -22,8 +21,6 @@ import org.eclipse.ui.IWorkbench;
  * @version 1.0
  */
 public class AbstractExcelImportWizard extends Wizard implements IImportWizard {
-       private static final Logger logger = Logger
-                       .getLogger(AbstractExcelImportWizard.class);
 
        /* (non-Javadoc)
         * @see org.eclipse.jface.wizard.Wizard#performFinish()
index a2dc4ac4aeb37fd6df96add53fa1d73120d0244b..0134387473657d17930d347d0e0225b74ff3c73a 100644 (file)
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.io.wizard;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.ui.IExportWizard;
 
@@ -22,8 +21,6 @@ import eu.etaxonomy.cdm.io.common.IIoConfigurator;
  * @version 1.0
  */
 public abstract class AbstractExportWizard<CONFIG extends IIoConfigurator> extends Wizard implements IExportWizard{
-       private static final Logger logger = Logger
-                       .getLogger(AbstractExportWizard.class);
        
        protected final String CONFIGURATION_PAGE = "CONFIGURATION_PAGE"; 
        
index a92254a79d909dc1db1834b21185d5ff660ef4d1..3ce0a540d84f70db0d4b663c6f5661d57b35ce90 100644 (file)
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.io.wizard;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.ui.IImportWizard;
 
@@ -23,8 +22,6 @@ import eu.etaxonomy.cdm.io.common.IIoConfigurator;
  * @version 1.0
  */
 public abstract class AbstractImportWizard<CONFIG extends IIoConfigurator> extends Wizard implements IImportWizard {
-       private static final Logger logger = Logger
-                       .getLogger(AbstractImportWizard.class);
        
        protected final String CONFIGURATION_PAGE = "CONFIGURATION_PAGE"; 
        
index 0a02f21652963d56298e75ca32b0f45f14df8fdf..9abbb1fe267de08538ce33739e8c8e64e39ed3ae 100644 (file)
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.io.wizard;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.ui.IWorkbench;
 
@@ -26,8 +25,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @version 1.0
  */
 public class BerlinModelExportWizard extends AbstractExportWizard<BerlinModelExportConfigurator> {
-       private static final Logger logger = Logger
-                       .getLogger(BerlinModelExportWizard.class);
        
        private CdmDataSourceSQLServerWizardPage pageDataSource;
 
index 0600daa5d2d6551932e3fd428707f101a2ad8fb3..73fe57079687df07ebc6372adb8ec63497472090 100644 (file)
 
 package eu.etaxonomy.taxeditor.io.wizard;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.ui.IWorkbench;
 
 import eu.etaxonomy.cdm.database.ICdmDataSource;
 import eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportConfigurator;
 import eu.etaxonomy.cdm.io.common.Source;
-import eu.etaxonomy.taxeditor.datasource.CdmDataSourceRepository;
 import eu.etaxonomy.taxeditor.datasource.wizard.CdmDataSourceSQLServerWizardPage;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
@@ -27,8 +25,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @version 1.0
  */
 public class BerlinModelImportWizard extends AbstractImportWizard<BerlinModelImportConfigurator> {
-       private static final Logger logger = Logger
-                       .getLogger(BerlinModelImportWizard.class);
 
        CdmDataSourceSQLServerWizardPage dataSourcePage;
        
index bff718f7ad73bff26cd89aaf0a20a968007858c9..0e90849d9da460157b58b74f5a3a68ecfe0c2a7f 100644 (file)
@@ -11,9 +11,7 @@
 package eu.etaxonomy.taxeditor.io.wizard;
 
 import java.io.File;
-import java.net.URI;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.ui.IImportWizard;
 import org.eclipse.ui.IWorkbench;
@@ -27,8 +25,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @version 1.0
  */
 public class EndnoteImportWizard extends AbstractImportWizard<EndnoteImportConfigurator> implements IImportWizard {
-       private static final Logger logger = Logger
-                       .getLogger(EndnoteImportWizard.class);
 
        private EndnoteImportConfigurator configurator;
 
index 5a810c60f1fe3b4e87c7370147a663f1b9c6127a..459521bdf1a4474aa08f2d49980b1ea5e5023ab8 100644 (file)
@@ -12,7 +12,6 @@ package eu.etaxonomy.taxeditor.io.wizard;
 
 import java.net.URI;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.ui.IWorkbench;
 
@@ -27,8 +26,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @version 1.0
  */
 public class ExcelNormalExplicitTaxaImportWizard extends AbstractImportWizard<NormalExplicitImportConfigurator>{
-       private static final Logger logger = Logger
-                       .getLogger(ExcelNormalExplicitTaxaImportWizard.class);
 
        private NormalExplicitImportConfigurator configurator;
 
index 942996705bab6eda8cb962750eb8f859d0eb232c..eb810f2662904be0e266ed6fe690066e82293d6f 100644 (file)
@@ -13,10 +13,8 @@ package eu.etaxonomy.taxeditor.io.wizard;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
@@ -44,8 +42,6 @@ public class ExportToFileDestinationWizardPage extends WizardPage{
        
        public static final String SDD_EXPORT = "SDD_EXPORT"; 
        
-       private static final Logger logger = Logger
-                       .getLogger(ExportToFileDestinationWizardPage.class);
        private DirectoryDialog folderDialog;
        private Text text_exportFileName;
 
index 7c4116c1706d5f97d02f527d208b85d4e3edd77b..4697dcfb3fcb076f1895d345c2298e27836f5ecd 100644 (file)
@@ -14,7 +14,6 @@ import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
@@ -26,6 +25,7 @@ import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 
 import eu.etaxonomy.cdm.io.common.IIoConfigurator;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
 
 /**
  * @author n.hoffmann
@@ -33,10 +33,6 @@ import eu.etaxonomy.cdm.io.common.IIoConfigurator;
  * @version 1.0
  */
 public class GenericConfiguratorWizardPage extends WizardPage {
-
-
-       private static final Logger logger = Logger
-                       .getLogger(GenericConfiguratorWizardPage.class);
        
        private IIoConfigurator configurator;
 
@@ -139,7 +135,7 @@ public class GenericConfiguratorWizardPage extends WizardPage {
                                        
                                break;
                        } catch (Exception e) {
-                               logger.warn("Could not invoke method");
+                               StoreUtil.warn(this.getClass(), "Could not invoke method");
                        } 
                }
                
@@ -164,7 +160,7 @@ public class GenericConfiguratorWizardPage extends WizardPage {
                                        
                                break;
                        } catch (Exception e) {
-                               logger.warn("Could not invoke method");
+                               StoreUtil.warn(this.getClass(), "Could not invoke method");
                        } 
                }
        }
index f0f0eea16bc6ff0e6850887c4158793c83fe5136..a98eb91ad6c59730a483f9367f246829fa63d9ff 100644 (file)
@@ -13,7 +13,6 @@ package eu.etaxonomy.taxeditor.io.wizard;
 import java.io.File;
 import java.net.URI;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -32,8 +31,6 @@ import org.eclipse.swt.widgets.Text;
  * @version 1.0
  */
 public class ImportFromFileDataSourceWizardPage extends WizardPage {
-       private static final Logger logger = Logger
-               .getLogger(ImportFromFileDataSourceWizardPage.class);
        
        public static final String PAGE_NAME = "CdmXmlDataSourceWizardPage";
 
index 6473216563cffee61543bf6d681a2a58e14cedb5..7599da381d9551a5f5176ef944d322989862ba34 100644 (file)
@@ -12,7 +12,6 @@ package eu.etaxonomy.taxeditor.io.wizard;
 
 import java.io.File;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.ui.IWorkbench;
 
@@ -25,8 +24,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @version 1.0
  */
 public class JaxbExportWizard extends AbstractExportWizard<JaxbExportConfigurator> {
-       private static final Logger logger = Logger
-                       .getLogger(JaxbExportWizard.class);
 
        private ExportToFileDestinationWizardPage page;
 
index fa2d9e6a6854dccaa862bb32c9040dc7d1a95cd0..44a20016e97fbcad5eb5ebfd37e3a4df1925ec51 100644 (file)
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.io.wizard;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.widgets.Composite;
 
@@ -28,9 +27,6 @@ public class JaxbImportSourceWizardPage extends WizardPage {
                // TODO Auto-generated constructor stub
        }
 
-       private static final Logger logger = Logger
-                       .getLogger(JaxbImportSourceWizardPage.class);
-
        /* (non-Javadoc)
         * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
         */
index e82e21e106bf316e0f7c17b3ca55379490b79fdb..840f841c5f2436ec148554bc7b2a8c6afd9ee28e 100644 (file)
 
 package eu.etaxonomy.taxeditor.io.wizard;
 
-import java.io.File;
 import java.net.URI;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.ui.IWorkbench;
 
@@ -27,8 +25,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @version 1.0
  */
 public class JaxbImportWizard extends AbstractImportWizard<JaxbImportConfigurator> {
-       private static final Logger logger = Logger
-                       .getLogger(JaxbImportWizard.class);
 
        private JaxbImportConfigurator configurator;
        
index e676c050112226d800510c915a470c9d94bb4b80..e1fac3487d0e04546faeb2b0d2ff0268968ae90a 100644 (file)
@@ -33,8 +33,6 @@ import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
  */
 public class NomenclaturalCodeWizardPage extends WizardPage {
        
-       
-       
        private IImportConfigurator configurator;
 
        /**
index 64806e65a46b1198714855aa0c1cc23bca270287..f2a6d5e61395a3d1612b8de9e3e9e6808b536cf6 100644 (file)
@@ -12,7 +12,6 @@ package eu.etaxonomy.taxeditor.io.wizard;
 
 import java.io.File;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.ui.IWorkbench;
 
@@ -25,8 +24,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @version 1.0
  */
 public class SddExportWizard extends AbstractExportWizard<SDDExportConfigurator> {
-       private static final Logger logger = Logger
-                       .getLogger(SddExportWizard.class);
 
        private ExportToFileDestinationWizardPage page;
        
index c35fbafcc9415fae1887dd279c3829fab0813ef6..2bbf0c8cd0acd4d29beab51a5f5c6df93da3b8c7 100644 (file)
 
 package eu.etaxonomy.taxeditor.io.wizard;
 
-import java.io.File;
 import java.net.URI;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.ui.IWorkbench;
 
@@ -27,8 +25,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @version 1.0
  */
 public class SddImportWizard extends AbstractImportWizard<SDDImportConfigurator> {
-       private static final Logger logger = Logger
-                       .getLogger(SddImportWizard.class);
 
        private SDDImportConfigurator configurator;
        
index 3b4be52547b8ad995c675b8688a489ac1d27aa30..3e7b5391d29ca16bd16c717c1a73dcc2c9083695 100644 (file)
@@ -12,7 +12,6 @@ package eu.etaxonomy.taxeditor.io.wizard;
 
 import java.io.File;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.ui.IWorkbench;
 
@@ -25,8 +24,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @version 1.0
  */
 public class TcsExportWizard extends AbstractExportWizard<TcsXmlExportConfigurator> {
-       private static final Logger logger = Logger
-                       .getLogger(TcsExportWizard.class);
        private static final String TCS_EXPORT = "TCS_EXPORT";
        private TcsXmlExportConfigurator configurator;
        private ExportToFileDestinationWizardPage page;
index f5b85c103b9a3277498440aa74aa62fc55ccc57b..455a8fa3bb1d8f16e4c35b1425ad8c6ece7369c1 100644 (file)
@@ -12,7 +12,6 @@ package eu.etaxonomy.taxeditor.io.wizard;
 
 import java.net.URI;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.ui.IWorkbench;
 
@@ -26,7 +25,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @version 1.0
  */
 public class TcsImportWizard extends AbstractImportWizard<TcsXmlImportConfigurator>{
-       private static final Logger logger = Logger.getLogger(TcsImportWizard.class);
        
        private TcsXmlImportConfigurator configurator;
 
index b4caae61a2faf9b8d0262c67c3b7af709d1f28a9..a81839f1012c7405fe9ba9a545857943eaccb3fd 100644 (file)
@@ -4,7 +4,6 @@
 package eu.etaxonomy.taxeditor.labels;\r
 \r
 import java.util.List;\r
-import java.util.SortedSet;\r
 \r
 import org.eclipse.swt.graphics.Image;\r
 \r
index 6539adc33e27fb6fed33d57e1c0253b91546e65e..162a0fc3450770905ac1dbb9dface9c4ff153a6a 100644 (file)
@@ -3,10 +3,8 @@
  */\r
 package eu.etaxonomy.taxeditor.labels;\r
 \r
-import org.apache.log4j.Logger;\r
 import org.eclipse.swt.graphics.Image;\r
 \r
-import eu.etaxonomy.cdm.model.name.NameRelationship;\r
 import eu.etaxonomy.cdm.model.name.NameRelationshipType;\r
 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;\r
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
@@ -20,7 +18,6 @@ import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
  *\r
  */\r
 public class LabelImageProvider implements ILabelImageStrategy {\r
-       private static final Logger logger = Logger.getLogger(LabelImageProvider.class);\r
 \r
        private ILabelImageStrategy strategy;\r
 \r
index b6bad4c3af1df4a0fa707e7707afd05ea1c16e2e..5ccc81ce52e430c6f33c847e9a8185010ba6400d 100644 (file)
@@ -3,7 +3,6 @@
  */\r
 package eu.etaxonomy.taxeditor.labels;\r
 \r
-import org.apache.log4j.Logger;\r
 import org.eclipse.swt.graphics.Image;\r
 \r
 import eu.etaxonomy.cdm.model.name.NameRelationshipType;\r
@@ -13,7 +12,6 @@ import eu.etaxonomy.cdm.model.name.NameRelationshipType;
  *\r
  */\r
 public class ZoologicalNameLabelStrategy extends DefaultLabelStrategy {\r
-       private static final Logger logger = Logger.getLogger(ZoologicalNameLabelStrategy.class);\r
 \r
        /* (non-Javadoc)\r
         * @see eu.etaxonomy.taxeditor.editor.labels.IEditorLabelStrategy#getNameRelationTypeLabel(eu.etaxonomy.cdm.model.name.NameRelationshipType)\r
index 4f4a2ebd311ee2585cddf0bc022466a2a5b4b352..2ca31173a43a6629f173eb8e4d1f2c6e1fc78530 100644 (file)
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.model;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.Viewer;
@@ -37,8 +36,6 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
  * @version 1.0
  */
 public abstract class AbstractCdmViewPart extends ViewPart implements ISelectionListener, IPostOperationEnabled, IConversationEnabled{
-       private static final Logger logger = Logger
-                       .getLogger(AbstractCdmViewPart.class);
        
        protected ISelectionService selectionService;
 
index 6380c07947676743304dec5098419ebbab1ce3d2..f900206ac538fdf4a0e9b98125e7ae59d05c2faf 100644 (file)
@@ -12,7 +12,6 @@ package eu.etaxonomy.taxeditor.model;
 
 import java.util.Vector;
 
-import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeEvent;
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
 
index c0bf3787f6ecf6db382d90cf9fcc466cf31ea665..d96b3ccf40479f980dbdb7dd307822e96de61c1e 100644 (file)
@@ -16,6 +16,7 @@ import org.apache.log4j.Logger;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.commands.operations.IOperationHistory;
 import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.ILog;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
@@ -56,7 +57,6 @@ import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
  * @version 1.0
  */
 public abstract class AbstractUtility {
-       private static final Logger logger = Logger.getLogger(AbstractUtility.class);
        
        protected static IStatusLineManager statusLineManager;
        
@@ -67,8 +67,6 @@ public abstract class AbstractUtility {
                
                return TaxeditorStorePlugin.getDefault().getWorkbench()
                                .getActiveWorkbenchWindow().getShell();
-               
-//             return Display.getDefault().getShells()[0];
        }
        
        public static IWorkbenchPage getActivePage(){
@@ -92,7 +90,7 @@ public abstract class AbstractUtility {
                try {
                        return PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView(id);
                } catch (PartInitException e) {
-                       logger.error("Could not open view: " + id, e);
+                       error(AbstractUtility.class, "Could not open view: " + id, e);
                        throw new RuntimeException(e);
                }
        }
@@ -167,8 +165,8 @@ public abstract class AbstractUtility {
         * Open a message box that informs the user about unimplemented functionality.
         * This method is for developer convenience.
         */
-       public static void notImplementedMessage(){
-               warningDialog("Not yet implemented", "This functionality is not yet implemented.");
+       public static void notImplementedMessage(Object source){
+               warningDialog("Not yet implemented", source, "This functionality is not yet implemented.");
        }
        
        public static void informationDialog(final String title, final String message){
@@ -180,20 +178,35 @@ public abstract class AbstractUtility {
                });
        }
        
-       public static void warningDialog(final String title, final String message){
+       /**
+        * 
+        * @param title The dialogs title
+        * @param source The object where the warning was generated (used by log4j)
+        * @param message An informative String to be presented to the user
+        */
+       public static void warningDialog(final String title, final Object source, final String message){
                Display.getDefault().asyncExec(new Runnable(){
 
                        public void run() {
                                MessageDialog.openWarning(getShell(), title, message);
+                               warn(AbstractUtility.class, message);
                        }
                });
        }
        
-       public static void errorDialog(final String title, final String message){
+       /**
+        * 
+        * @param title The dialogs title
+        * @param source The object where the warning was generated (used by log4j)
+        * @param message An informative String to be presented to the user
+        * @param t a Throwable if one exists or null
+        */
+       public static void errorDialog(final String title, final Object source, final String message, final Throwable t){
                Display.getDefault().asyncExec(new Runnable(){
 
                        public void run() {
                                MessageDialog.openError(getShell(), title, message);
+                               error(AbstractUtility.class, message, t);
                        }
                });
        }
@@ -363,17 +376,97 @@ public abstract class AbstractUtility {
                getProgressService().runInUI(getWorkbenchWindow(), runnable, rule);             
        }
        
+       /**
+        * 
+        * @param fork
+        * @param cancelable
+        * @param runnable
+        * @throws InvocationTargetException
+        * @throws InterruptedException
+        */
        public static void run(boolean fork, boolean cancelable, IRunnableWithProgress runnable) throws InvocationTargetException, InterruptedException{
                getProgressService().run(fork, cancelable, runnable);
        }
        
+       /**
+        * 
+        * @return
+        */
        public static IProgressService getProgressService(){
                IWorkbench workbench = PlatformUI.getWorkbench();
                return workbench.getProgressService();
        }
        
+       /**
+        * 
+        * @return
+        */
        public static IWorkbenchSiteProgressService getProgressService2(){
                return (IWorkbenchSiteProgressService) getService(IWorkbenchSiteProgressService.class);
        }
-
+               
+       /**
+        * 
+        * @param source
+        * @param message
+        */
+       public static void info(Class source, String message){
+               IStatus status = new Status(IStatus.INFO, getPluginId(), message);
+               info(source, status);
+       }
+       
+       /**
+        * 
+        * @param source
+        * @param status
+        */
+       public static void info(Class source, IStatus status){
+               Logger.getLogger(source).info(status.getMessage());
+               log(status);
+       }
+       
+       /**
+        * 
+        * @param source
+        * @param message
+        */
+       public static void warn(Class source, String message){
+               IStatus status = new Status(IStatus.WARNING, getPluginId(), message);
+               Logger.getLogger(source).warn(message);
+               log(status);
+       }
+       
+       /**
+        * 
+        * @param source
+        * @param t
+        */
+       public static void error(Class source, Throwable t){
+               error(source.getClass(), t.getMessage(), t);
+       }
+       
+       /**
+        * 
+        * @param source
+        * @param message
+        * @param t
+        */
+       public static void error(Class source, String message, Throwable t){
+               IStatus status = new Status(IStatus.ERROR, getPluginId(), message, t);
+               Logger.getLogger(source).error(message, t);
+               log(status);
+       }
+       
+       /**
+        * @see {@link ILog#log(IStatus)}
+        * 
+        * @param status
+        */
+       private static void log(IStatus status){
+               TaxeditorStorePlugin.getDefault().getLog().log(status);
+       }
+       
+       protected static String getPluginId(){
+               return "Override in subclasses";
+       }
 }
index 948dd62a490c2dd7e6c984ce7f1177b8ec71543c..00c2db720faa569a11529c83368dad78b4e588a0 100644 (file)
@@ -10,8 +10,6 @@
 
 package eu.etaxonomy.taxeditor.model;
 
-import org.apache.log4j.Logger;
-
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.agent.Team;
@@ -22,7 +20,6 @@ import eu.etaxonomy.cdm.model.agent.Team;
  * @version 1.0
  */
 public class AuthorHelper {
-       private static final Logger logger = Logger.getLogger(AuthorHelper.class);
        
        public static Team getAuthor(Object object){
                if(object == null){
index 3f1fb688b637ccfbc4af6765cadf9c6d3616b5b8..f0fc345d9acad5d13dea9a079c56eb2416c14c4f 100644 (file)
@@ -3,8 +3,6 @@
  */
 package eu.etaxonomy.taxeditor.model;
 
-import org.apache.log4j.Logger;
-
 import eu.etaxonomy.cdm.common.IProgressMonitor;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 
@@ -15,8 +13,6 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
  * @version 1.0
  */
 public class CdmProgressMonitorAdapter implements IProgressMonitor {
-
-       private static final Logger logger = Logger.getLogger(CdmProgressMonitorAdapter.class);
        
        private org.eclipse.core.runtime.IProgressMonitor progressMonitor;
 
@@ -70,11 +66,11 @@ public class CdmProgressMonitorAdapter implements IProgressMonitor {
 
        @Override
        public void warning(String message) {
-               logger.warn(message);
+               StoreUtil.warn(this.getClass(), message);
        }
 
        @Override
        public void warning(String message, Throwable throwable) {
-               logger.warn(message, throwable);
+               StoreUtil.error(this.getClass(), message, throwable);
        }
 }
index 23d7f34387f27a4645e34d1321f744d68512409b..43f6901a027aff5c69754a64788899930672a051 100644 (file)
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.model;
 
-import org.apache.log4j.Logger;
 import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.widgets.Text;
 
@@ -20,8 +19,6 @@ import org.eclipse.swt.widgets.Text;
  * @version 1.0
  */
 public class CommonHelper {
-       private static final Logger logger = Logger.getLogger(CommonHelper.class);
-       
        /**
         * 
         * @param text
index 6cd86e98d19fb77d89411701703a4a1aa5df4519..1f9312543d7b419681b345aba16d07cc44fbb4b6 100644 (file)
@@ -13,7 +13,6 @@ package eu.etaxonomy.taxeditor.model;
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.log4j.Logger;
 import org.hibernate.LazyInitializationException;
 
 import eu.etaxonomy.cdm.api.service.DefaultCategoricalDescriptionBuilder;
@@ -45,6 +44,7 @@ import eu.etaxonomy.cdm.model.media.Media;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
 
 /**
  * @author p.ciardelli
@@ -53,8 +53,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @version 1.0
  */
 public class DescriptionHelper {
-       private static final Logger logger = Logger
-                       .getLogger(DescriptionHelper.class);
        
        /**
         * Returns whatever the element's title cache equivalent is,
@@ -133,10 +131,10 @@ public class DescriptionHelper {
                        
                }
                if(element instanceof Distribution){
-                       logger.warn("trying to set cache on distribution, don't know what to do at the moment.");
+                       StoreUtil.warn(DescriptionHelper.class, "trying to set cache on distribution, don't know what to do at the moment.");
                        return;
                }
-               logger.warn("No matching subclass found for DescriptionElementBase object, 'cache' not set.");
+               StoreUtil.warn(DescriptionHelper.class, "No matching subclass found for DescriptionElementBase object, 'cache' not set.");
        }
        
        /**
@@ -160,7 +158,7 @@ public class DescriptionHelper {
                                return ((IdentifiableEntity) element).getTitleCache();
                        }catch(LazyInitializationException e){
                                String result = "No Session to initialize title cache for IdentifiableEntity";
-                               logger.error(result);
+                               StoreUtil.error(DescriptionHelper.class, result, e);
                                return "TODO: " + result;
                        }
                }
@@ -180,7 +178,7 @@ public class DescriptionHelper {
                                return CdmUtils.concat("; ", new String[]{originalSource.getIdNamespace(), originalSource.getIdInSource(), sourceObjectTitle});
                        }catch(LazyInitializationException e){
                                String result = "Error initializing title cache for ISourceable of an OriginalSourceBase";
-                               logger.error(result);
+                               StoreUtil.error(DescriptionHelper.class, result, e);
                                return "TODO: " + result;
                        }
                }
index a73768b603731c3c65de86e40f487e59546b6f6c..cc50e1319101f70c08a1fd336bd18fe9b4cb004c 100644 (file)
@@ -19,7 +19,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 
-import org.apache.log4j.Logger;
 import org.joda.time.DateTime;
 
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
@@ -48,9 +47,6 @@ import eu.etaxonomy.cdm.model.description.TaxonDescription;
  * @version 1.0
  */
 public class FeatureNodeContainer implements IAnnotatableEntity{
-       private static final Logger logger = Logger
-                       .getLogger(FeatureNodeContainer.class);
-
        
        public static Comparator<DescriptionElementBase> comparator = new Comparator<DescriptionElementBase>() {
 
index c255c775b9ac517950a6478b7f17f358482fc5cf..a7a97035cd27c6077af49a5c1b636f9aaf3a92c2 100644 (file)
@@ -13,7 +13,6 @@ package eu.etaxonomy.taxeditor.model;
 import java.util.Iterator;\r
 import java.util.List;\r
 \r
-import org.apache.log4j.Logger;\r
 import org.eclipse.jface.text.IDocument;\r
 import org.eclipse.jface.text.ITextSelection;\r
 import org.eclipse.jface.text.TextSelection;\r
@@ -30,8 +29,6 @@ import org.eclipse.jface.viewers.StructuredSelection;
  * @version 1.0\r
  */\r
 public class LineSelection extends TextSelection implements IStructuredSelection {\r
-       @SuppressWarnings("unused")\r
-       private static final Logger logger = Logger.getLogger(LineSelection.class);\r
 \r
        private StructuredSelection structuredSelection;\r
        \r
index 42c984ac9aae651f17f498ca19c929fea68b622f..99f01107b9731d815a33bf7224338c83a3c4a3cb 100644 (file)
@@ -20,19 +20,18 @@ import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.UnsupportedEncodingException;
 
-import org.apache.log4j.Logger;
 import org.eclipse.ui.IMemento;
 import org.eclipse.ui.WorkbenchException;
 import org.eclipse.ui.XMLMemento;
 
+import eu.etaxonomy.taxeditor.store.StoreUtil;
+
 /**
  * @author n.hoffmann
  * @created Mar 29, 2010
  * @version 1.0
  */
 public class MementoHelper {
-       private static final Logger logger = Logger.getLogger(MementoHelper.class);
-
        
        public static IMemento readMementoFromFile(File stateFile) throws FileNotFoundException{
                FileInputStream input;
@@ -42,9 +41,9 @@ public class MementoHelper {
                                        new InputStreamReader(input, "utf-8")); //$NON-NLS-1$
                        return XMLMemento.createReadRoot(reader);
                } catch (WorkbenchException e) {
-                       logger.error("Exception while reading the memento", e);
+                       StoreUtil.error(MementoHelper.class, "Exception while reading the memento", e);
                } catch (UnsupportedEncodingException e) {
-                       logger.error("Exception while reading the memento", e);
+                       StoreUtil.error(MementoHelper.class, "Exception while reading the memento", e);
                }
 
                return null;
@@ -66,7 +65,7 @@ public class MementoHelper {
                        writer.close();
                } catch (IOException e) {
                        stateFile.delete();
-                       logger.error("Could not save datasource state");
+                       StoreUtil.error(MementoHelper.class, "Could not save datasource state", e);
                        return null;
                }
 
index baded73db3f05e5e3ac91a5a4ca485d4c10ea659..3dc023fa69670ae2349485a5802990eb6f9d6428 100644 (file)
@@ -13,8 +13,6 @@ package eu.etaxonomy.taxeditor.model;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
-
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.common.MultilanguageTextHelper;
@@ -26,8 +24,6 @@ import eu.etaxonomy.cdm.model.common.TermBase;
  * @version 1.0
  */
 public class MultiLanguageText {
-       private static final Logger logger = Logger
-                       .getLogger(MultiLanguageText.class);
        
        private Map<Language, LanguageString> languageTextMap;
        
index 7aabba50001e1e90b27f013e9f9abf50534863ad..c342b418f3d83cbd3d88d40f1306ae0112867767 100644 (file)
@@ -21,7 +21,6 @@ import eu.etaxonomy.cdm.model.taxon.TaxonBase;
  */
 public class NameHelper {      
 
-       @SuppressWarnings("unchecked")
        public static String getDisplayName(TaxonNameBase name){
                return name.getTitleCache();
        }
@@ -30,7 +29,6 @@ public class NameHelper {
                return getDisplayName(taxon.getName());
        }
        
-       @SuppressWarnings("unchecked")
        public static String getDisplayNameWithRef(TaxonBase taxonBase) {
                TaxonNameBase name = (TaxonNameBase) HibernateProxyHelper.deproxy(taxonBase.getName());
                if (name != null) {
index 8f2490addc40a23c103f512cdbe7976fd6f3e8a1..858730fcf0f3f3a9b38a45ad70ee2d1a19a51fb5 100644 (file)
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.model;
 
-import org.apache.log4j.Logger;
 import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.widgets.Control;
 
@@ -20,7 +19,6 @@ import org.eclipse.swt.widgets.Control;
  * @version 1.0
  */
 public class TextHelper {
-       private static final Logger logger = Logger.getLogger(TextHelper.class);
        
        public static final String ELLIPSIS = "...";
                
index 2b34d7bd97c8bace8804281abf50575ec97013bd..9575abe416caa17be66aaa22ce3e03855172c7c8 100644 (file)
@@ -10,9 +10,7 @@
 
 package eu.etaxonomy.taxeditor.newWizards;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.widgets.Composite;
 
 /**
  * @author n.hoffmann
@@ -21,10 +19,6 @@ import org.eclipse.swt.widgets.Composite;
  */
 public abstract class AbstractSpecificReferenceWizardPage extends WizardPage {
 
-
-       private static final Logger logger = Logger
-                       .getLogger(AbstractSpecificReferenceWizardPage.class);
-
        protected AbstractSpecificReferenceWizardPage(String pageName) {
                super(pageName);
        }
index bba73172fcb0a943882f6459948002e7290d139d..82c97f421ecae5c8c2ac39ed31573f8bf2474b8c 100644 (file)
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.newWizards;
 
-import org.apache.log4j.Logger;
 import org.eclipse.swt.widgets.Composite;
 
 /**
@@ -20,10 +19,6 @@ import org.eclipse.swt.widgets.Composite;
  */
 public class BookDetailsWizardPage extends AbstractSpecificReferenceWizardPage {
 
-
-       private static final Logger logger = Logger
-                       .getLogger(BookDetailsWizardPage.class);
-
        protected BookDetailsWizardPage(String pageName) {
                super(pageName);
                // TODO Auto-generated constructor stub
index 7e48da77848e57b02baa49c5e04a3a1c46ad3904..b82e28b9e1d4dfab62d5ae7e954900634ee16fc7 100644 (file)
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.newWizards;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
@@ -29,10 +28,6 @@ import eu.etaxonomy.cdm.model.agent.AgentBase;
  * @version 1.0
  */
 public class NewGenericReferenceWizardPage extends WizardPage {
-
-
-       private static final Logger logger = Logger
-                       .getLogger(NewGenericReferenceWizardPage.class);
        
        private Combo combo_referenceType;
        private Text text_title;
index 95c0cc1d1de2bbfd0adec8729572a2c2bac44d46..08ffbbc487d25de02ef4ce7cd4f2fc390d82d8ef 100644 (file)
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.newWizards;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.ui.INewWizard;
@@ -24,7 +23,6 @@ import eu.etaxonomy.cdm.model.name.NonViralName;
  * @version 1.0
  */
 public class NewNameWizard extends Wizard implements INewWizard {
-       private static final Logger logger = Logger.getLogger(NewNameWizard.class);
 
        public static final String NEW_NAME = "NEW_NAME";
 
index be63c61d942395ba49120eb8c9061c30debbba12..ec1559e4ca62f9d5670f860f6622da6827a38fdd 100644 (file)
@@ -11,7 +11,6 @@ package eu.etaxonomy.taxeditor.operations;
 \r
 import java.util.UUID;\r
 \r
-import org.apache.log4j.Logger;\r
 import org.eclipse.core.commands.operations.AbstractOperation;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
 import org.eclipse.core.runtime.IStatus;\r
@@ -28,9 +27,6 @@ import eu.etaxonomy.cdm.model.taxon.TaxonNode;
  * @author n.hoffmann\r
  */\r
 public abstract class AbstractPostOperation extends AbstractOperation {\r
-\r
-       private static final Logger logger = Logger\r
-                       .getLogger(AbstractPostOperation.class);\r
        \r
        /**\r
         * \r
@@ -128,7 +124,6 @@ public abstract class AbstractPostOperation extends AbstractOperation {
         */\r
        protected IStatus postExecute(CdmBase objectAffectedByOperation) {      \r
                if(postOperationEnabled != null){\r
-                       logger.trace("executing post operation");\r
                        return postOperationEnabled.postOperation(objectAffectedByOperation) ? Status.OK_STATUS : Status.CANCEL_STATUS;\r
                }\r
                return Status.OK_STATUS;\r
index 905d96ec44f504bde4c7832a54b50e6e0da2e7f7..d3f59a1ea0f9b4e3c709c3c7892f7ea3d1fbea65 100644 (file)
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.operations;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.commands.operations.IUndoContext;
 import org.eclipse.core.runtime.IAdaptable;
@@ -29,9 +28,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  */
 public class ChangeAcceptedTaxonToSynonymOperation extends
                AbstractPersistentPostOperation {
-
-       private static final Logger logger = Logger
-                       .getLogger(ChangeAcceptedTaxonToSynonymOperation.class);
        
        private TaxonNode newAcceptedTaxonNode;
 
index 86e5c80b4d7dd130bd3cba0a49333c336ac45c11..5edf39610fd166554456111d0d5541e4a4eec0d6 100644 (file)
@@ -11,7 +11,6 @@ package eu.etaxonomy.taxeditor.operations;
 \r
 import java.util.Set;\r
 \r
-import org.apache.log4j.Logger;\r
 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
 import org.eclipse.core.runtime.IAdaptable;\r
@@ -29,10 +28,6 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
  * @version 1.0\r
  */\r
 public class ChangeConceptRelationshipTypeOperation extends AbstractPostOperation {\r
-\r
-\r
-       private static final Logger logger = Logger\r
-                       .getLogger(ChangeConceptRelationshipTypeOperation.class);\r
        \r
        private Taxon relatedTaxon;\r
        \r
@@ -50,7 +45,7 @@ public class ChangeConceptRelationshipTypeOperation extends AbstractPostOperatio
                Set<TaxonRelationship> taxonRelationships = taxon.getTaxonRelations(relatedTaxon);\r
                \r
                if(taxonRelationships.size() > 1){\r
-                       StoreUtil.warningDialog("Multiple relations between taxa", "There are multiple relations between the " +\r
+                       StoreUtil.warningDialog("Multiple relations between taxa", this, "There are multiple relations between the " +\r
                                        "accepted and the related taxon. This case is not handled by the software yet");\r
                        return;\r
                }\r
@@ -96,7 +91,7 @@ public class ChangeConceptRelationshipTypeOperation extends AbstractPostOperatio
        public IStatus undo(IProgressMonitor monitor, IAdaptable info)\r
                        throws ExecutionException {\r
                // see FIXME in execute()\r
-               logger.warn("Not implemented yet. See developer documentation for details");\r
+               StoreUtil.warn(this.getClass(), "Not implemented yet. See developer documentation for details");\r
                return null;\r
        }\r
 }\r
index ee0a52b34069b16433d41278bc9feef3f930e49a..17f4045211189692f878d104f6e099476b221015 100644 (file)
@@ -16,13 +16,10 @@ import org.eclipse.core.commands.operations.IUndoContext;
 import org.eclipse.core.runtime.IAdaptable;\r
 import org.eclipse.core.runtime.IProgressMonitor;\r
 import org.eclipse.core.runtime.IStatus;\r
-import org.eclipse.core.runtime.OperationCanceledException;\r
 \r
 import eu.etaxonomy.cdm.model.name.HomotypicalGroup;\r
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
-import eu.etaxonomy.cdm.model.taxon.Synonym;\r
 import eu.etaxonomy.cdm.model.taxon.SynonymRelationship;\r
-import eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;\r
@@ -54,7 +51,7 @@ public class ChangeConceptToSynonymOperation extends
                Set<TaxonRelationship> taxonRelationships = taxon.getTaxonRelations(concept);\r
                \r
                if(taxonRelationships.size() > 1){\r
-                       StoreUtil.warningDialog("Multiple relations between taxa", "There are multiple relations between the " +\r
+                       StoreUtil.warningDialog("Multiple relations between taxa", this, "There are multiple relations between the " +\r
                                        "accepted and the related taxon. This case is not handled by the software yet");\r
                        return;\r
                }\r
index 4928f76141035c3862eb90f093243ab97fb1e0d1..33f7812274469d508c20e3836e2c83f371c5348f 100644 (file)
@@ -9,8 +9,6 @@
 */\r
 package eu.etaxonomy.taxeditor.operations;\r
 \r
-import java.lang.reflect.Method;\r
-\r
 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
 import org.eclipse.core.runtime.IAdaptable;\r
index 2c099fbc9a461f001e04693a5ab18da8460023df..97aa12f5280153ce2712e0ea4df69d17fbf67ee1 100644 (file)
@@ -9,20 +9,17 @@
 \r
 package eu.etaxonomy.taxeditor.operations;\r
 \r
-import org.apache.log4j.Logger;\r
 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
 import org.eclipse.core.runtime.IAdaptable;\r
 import org.eclipse.core.runtime.IProgressMonitor;\r
 import org.eclipse.core.runtime.IStatus;\r
-import org.eclipse.core.runtime.OperationCanceledException;\r
 \r
 import eu.etaxonomy.cdm.model.name.HomotypicalGroup;\r
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.model.taxon.Synonym;\r
 import eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.taxeditor.store.StoreUtil;\r
 \r
 /**\r
  * Change the homotypical group of a given synonym.\r
@@ -32,10 +29,6 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
  * @version 1.0\r
  */\r
 public class ChangeHomotypicGroupOperation extends AbstractPostOperation {\r
-       \r
-       @SuppressWarnings("unused")\r
-       private static final Logger logger = Logger\r
-                       .getLogger(ChangeHomotypicGroupOperation.class);\r
 \r
        /**\r
         * The synonym to be moved.\r
index c13079d71bc0d4dfff6a507c79a571bceea761f7..937f72265e51cbfbf97f6a0d050d42cb17e9d27d 100644 (file)
@@ -9,7 +9,6 @@
 \r
 package eu.etaxonomy.taxeditor.operations;\r
 \r
-import org.apache.log4j.Logger;\r
 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
 import org.eclipse.core.runtime.IAdaptable;\r
@@ -22,6 +21,7 @@ import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;\r
 import eu.etaxonomy.taxeditor.store.CdmStore;\r
+import eu.etaxonomy.taxeditor.store.StoreUtil;\r
 \r
 /**\r
  * Change the taxonomic parent of a given taxon.\r
@@ -32,9 +32,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  */\r
 public class ChangeSynonymToAcceptedTaxonOperation extends AbstractPersistentPostOperation {\r
        \r
-       @SuppressWarnings("unused")\r
-       private static final Logger logger = Logger.getLogger(ChangeSynonymToAcceptedTaxonOperation.class);\r
-\r
        private Taxon newTaxon;\r
        private Synonym synonym;\r
        private ITreeNode parentNode;\r
@@ -97,7 +94,7 @@ public class ChangeSynonymToAcceptedTaxonOperation extends AbstractPersistentPos
                        throws ExecutionException {\r
                \r
                // TODO implement - biggest problem is that any window open for new taxon must be closed first\r
-               logger.warn("Not yet implemented");\r
+               StoreUtil.warn(this.getClass(), "Not yet implemented");\r
                \r
                return postExecute(taxon);\r
        }\r
index 5e5d7c5bd5b438d44f9c3df0f848019200cb4224..51e996253d53b73795e842e105a475d0f6201329 100644 (file)
@@ -14,14 +14,11 @@ import org.eclipse.core.commands.operations.IUndoContext;
 import org.eclipse.core.runtime.IAdaptable;\r
 import org.eclipse.core.runtime.IProgressMonitor;\r
 import org.eclipse.core.runtime.IStatus;\r
-import org.eclipse.core.runtime.OperationCanceledException;\r
 \r
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.model.taxon.Synonym;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;\r
 import eu.etaxonomy.taxeditor.store.CdmStore;\r
-import eu.etaxonomy.taxeditor.store.StoreUtil;\r
 \r
 /**\r
  * @author p.ciardelli\r
index 610c115f828a35c1ec06e590bb1d8fa22e90ef18..017a75a47833345dedd5d21fc30c5879f1ff53c6 100644 (file)
@@ -9,7 +9,6 @@
 \r
 package eu.etaxonomy.taxeditor.operations;\r
 \r
-import org.apache.log4j.Logger;\r
 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
 import org.eclipse.core.runtime.IAdaptable;\r
@@ -26,8 +25,6 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
  * @deprecated there will be an operation to set the basionym only that automatically unsets the former basionym\r
  */\r
 public class ChangeSynonymToHomotypicalGroupBasionymOperation extends AbstractPostOperation {\r
-       private static final Logger logger = Logger\r
-                       .getLogger(ChangeSynonymToHomotypicalGroupBasionymOperation.class);\r
        \r
        private Synonym synonym;\r
 \r
index 415e7d0b29a28b86c5fa44ae734f40647d613203..60247d5f2d239c07ca17d7aebe187d8fedc15626 100644 (file)
@@ -16,7 +16,6 @@ import org.eclipse.core.commands.operations.IUndoContext;
 import org.eclipse.core.runtime.IAdaptable;\r
 import org.eclipse.core.runtime.IProgressMonitor;\r
 import org.eclipse.core.runtime.IStatus;\r
-import org.eclipse.core.runtime.OperationCanceledException;\r
 \r
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.model.taxon.Synonym;\r
@@ -24,7 +23,6 @@ import eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType;
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;\r
 import eu.etaxonomy.taxeditor.store.CdmStore;\r
-import eu.etaxonomy.taxeditor.store.StoreUtil;\r
 \r
 /**\r
  * @author p.ciardelli\r
index 377dc496b4acd0bd3d636378484ce74f0eb7c96c..1b09ec4d0140824c6e17b75e84f15869a71d2b9c 100644 (file)
@@ -17,7 +17,6 @@ import org.eclipse.core.runtime.IStatus;
 \r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;\r
-import eu.etaxonomy.taxeditor.store.StoreUtil;\r
 \r
 /**\r
  * @author p.ciardelli\r
index 0f7711e7da5a10cbeb99d3ed8a042b50cb9abf05..849d0cd0508184b3dfc6ef481a5250244d733585 100644 (file)
@@ -20,7 +20,6 @@ import eu.etaxonomy.cdm.api.utility.ImagesUtility;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;\r
 import eu.etaxonomy.cdm.model.media.ImageFile;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.taxeditor.store.StoreUtil;\r
 \r
 /**\r
  * @author p.ciardelli\r
index bd7bef0d9ca214d9a2b47d5bd4b7cbc68e709d86..8238cd0bf882da072a528afd9472124d0f10570d 100644 (file)
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.operations;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.commands.operations.IUndoContext;
 import org.eclipse.core.runtime.IAdaptable;
@@ -28,9 +27,6 @@ import eu.etaxonomy.cdm.model.taxon.TaxonBase;
  */
 public class CreateNameRelationOperation extends AbstractPostOperation {
 
-
-       private static final Logger logger = Logger
-                       .getLogger(CreateNameRelationOperation.class);
        private TaxonBase taxonBase;
        private TaxonNameBase relatedName;
        private NameRelationshipType type;
index dfc1f518f31a74920811ac556eb6839768b751c7..f183d93d337f396769274192bbc0c6113c86ad7c 100644 (file)
@@ -19,7 +19,6 @@ import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.model.taxon.SynonymRelationship;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.taxeditor.store.StoreUtil;\r
 \r
 /**\r
  * @author n.hoffmann\r
index 7dbef22a1bb17d59daecd8218accfa1a2cafb023..95d959506e47ca23baed5e5508e6095c6b18cefd 100644 (file)
@@ -19,7 +19,6 @@ import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.model.taxon.SynonymRelationship;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.taxeditor.store.StoreUtil;\r
 \r
 /**\r
  * <ol>\r
index 8105c5da2212afb9b086030a776d046d45d43b25..d2a12a26113e223bd4328ec866e7099fbe54241a 100644 (file)
@@ -20,7 +20,6 @@ import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.cdm.model.description.TextData;\r
 import eu.etaxonomy.cdm.model.media.Media;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.taxeditor.store.StoreUtil;\r
 \r
 /**\r
  * @author p.ciardelli\r
index bb39a08785a27375fcf4659b9b977a32f02644ca..be285c83da2809a14435afbcca3ab33ad5401f60 100644 (file)
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.operations;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.commands.operations.IUndoContext;
 import org.eclipse.core.runtime.IAdaptable;
@@ -33,8 +32,6 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
  */
 public class CreateTaxonNodeOperation extends AbstractPersistentPostOperation {
        
-       private static final Logger logger = Logger.getLogger(CreateTaxonNodeOperation.class);
-       
        private Taxon newTaxon;
        
        private TaxonNode childTaxonNode;
@@ -93,7 +90,7 @@ public class CreateTaxonNodeOperation extends AbstractPersistentPostOperation {
                        
                        return postExecute(childTaxonNode);
                }catch(Exception e){
-                       StoreUtil.warningDialog("Could not create taxon node", e.getMessage());
+                       StoreUtil.warningDialog("Could not create taxon node", this, e.getMessage());
                        return Status.CANCEL_STATUS;
                }               
        }
@@ -114,7 +111,7 @@ public class CreateTaxonNodeOperation extends AbstractPersistentPostOperation {
        public IStatus undo(IProgressMonitor monitor, IAdaptable info)
                        throws ExecutionException {
                
-               logger.warn("Not yet implemented.");
+               StoreUtil.warn(this.getClass(), "Not yet implemented.");
                return null;
        }
 }
index e6f5dc0b5cbe359177a2fe28c67fc2099c922f2d..5012b25aee3cf39df1425158935f052159612720 100644 (file)
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.operations;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.commands.operations.IUndoContext;
 import org.eclipse.core.runtime.IAdaptable;
@@ -27,9 +26,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @version 1.0
  */
 public class CreateUserOperation extends AbstractPersistentPostOperation {
-
-       private static final Logger logger = Logger
-       .getLogger(CreateUserOperation.class);
        
        private User user;
 
index 1519bb598076a722e6972cffbf61a6a423730e05..d4384ebb1df2191e53f82dc0cec18f6bd1602cc9 100644 (file)
@@ -52,7 +52,7 @@ public class DeleteConceptRelationOperation extends AbstractPostOperation {
                Set<TaxonRelationship> taxonRelationships = taxon.getTaxonRelations(relatedTaxon);\r
                \r
                if(taxonRelationships.size() > 1){\r
-                       StoreUtil.warningDialog("Multiple relations between taxa", "There are multiple relations between the " +\r
+                       StoreUtil.warningDialog("Multiple relations between taxa", this, "There are multiple relations between the " +\r
                                        "accepted and the related taxon. This case is not handled by the software yet");\r
                        return;\r
                }\r
index 72003d7c656e21b6dc342200c83fed36eeaea823..e534ee37b44664254e0a0d1f4779a1dccc586710 100644 (file)
@@ -9,7 +9,6 @@
 \r
 package eu.etaxonomy.taxeditor.operations;\r
 \r
-import org.apache.log4j.Logger;\r
 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
 import org.eclipse.core.runtime.IAdaptable;\r
@@ -18,6 +17,7 @@ import org.eclipse.core.runtime.IStatus;
 \r
 import eu.etaxonomy.cdm.model.description.DescriptionBase;\r
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;\r
+import eu.etaxonomy.taxeditor.store.StoreUtil;\r
 \r
 /**\r
  * @author p.ciardelli\r
@@ -25,8 +25,6 @@ import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
  * @version 1.0\r
  */\r
 public class DeleteDescriptionElementOperation extends AbstractPostOperation {\r
-       private static final Logger logger = Logger\r
-                       .getLogger(DeleteDescriptionElementOperation.class);\r
        \r
        private DescriptionElementBase element;\r
        private DescriptionBase description = null;\r
@@ -51,7 +49,7 @@ public class DeleteDescriptionElementOperation extends AbstractPostOperation {
                \r
                // Remove element from description\r
                if (description == null) {\r
-                       logger.error("Couldn't find element's description!");\r
+                       StoreUtil.error(this.getClass(), "Couldn't find element's description!", null);\r
                } else {\r
                        description.removeElement(element);\r
                }\r
index 536d787e4140e42fb2f417b2d320e484fbca4257..87ec1c6b17be11a82b7dd10457f47033db83f123 100644 (file)
@@ -19,7 +19,6 @@ import eu.etaxonomy.cdm.model.reference.ReferenceBase;
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;\r
-import eu.etaxonomy.taxeditor.store.StoreUtil;\r
 \r
 /**\r
  * @author p.ciardelli\r
index b9de68524439520a0dddf0b1f7f88d4aff3a567e..f67fbe92e512dcb7480ca48123d3f04451e4cd7f 100644 (file)
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.operations;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.commands.operations.IUndoContext;
 import org.eclipse.core.runtime.IAdaptable;
@@ -27,9 +26,6 @@ import eu.etaxonomy.cdm.model.name.TaxonNameBase;
  */
 public class DeleteNameRelationOperation extends AbstractPostOperation {
 
-
-       private static final Logger logger = Logger
-                       .getLogger(DeleteNameRelationOperation.class);
        private NameRelationship nameRelationship;
 
        public DeleteNameRelationOperation(String label, IUndoContext undoContext, NameRelationship nameRelationship,
index fd4001bad89944d289030915c063d2f22d5ba8ae..c4c7f8e950a247934ec52dac49b7eb27331a3b1f 100644 (file)
@@ -20,8 +20,6 @@ import org.eclipse.core.runtime.IStatus;
 import eu.etaxonomy.cdm.model.taxon.Synonym;\r
 import eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.taxeditor.store.CdmStore;\r
-import eu.etaxonomy.taxeditor.store.StoreUtil;\r
 \r
 /**\r
  * @author p.ciardelli\r
index ec6964fdadca31baeedf8a05b316d8f5c3daabc1..b787a618205982c88a560f23610ebe76f76a75d6 100644 (file)
@@ -12,7 +12,6 @@ package eu.etaxonomy.taxeditor.operations;
 
 import java.util.Set;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.commands.operations.IUndoContext;
 import org.eclipse.core.runtime.IAdaptable;
@@ -33,8 +32,6 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
  */
 public class DeleteTreeNodeOperation extends AbstractPersistentPostOperation{
        
-       private static final Logger logger = Logger
-       .getLogger(DeleteTreeNodeOperation.class);
        private Set<ITreeNode> treeNodes;
 
        
@@ -68,7 +65,7 @@ public class DeleteTreeNodeOperation extends AbstractPersistentPostOperation{
                        }else if(treeNode instanceof TaxonomicTree){
                                TaxonomicTree taxonomicTree = (TaxonomicTree) treeNode;
                                if(taxonomicTree.hasChildNodes()){
-                                       StoreUtil.warningDialog("Tree is not empty", "It is not possible to delete a Taxonomic Tree that " +
+                                       StoreUtil.warningDialog("Tree is not empty", this, "It is not possible to delete a Taxonomic Tree that " +
                                                        "is not empty. Please delete included taxa first");
                                }else{
                                        CdmStore.getTaxonTreeService().delete(taxonomicTree);
index 5b450c707651c1edd0a0cb0c1351c6b68d6e7532..9853d4f5bf5fc5a098a29bf81d23470ecdeffb9e 100644 (file)
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.operations;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.commands.operations.IUndoContext;
 import org.eclipse.core.runtime.IAdaptable;
@@ -27,8 +26,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @version 1.0
  */
 public class EditTaxonomicTreeOperation extends AbstractPersistentPostOperation {
-       private static final Logger logger = Logger
-                       .getLogger(EditTaxonomicTreeOperation.class);
        private TaxonomicTree classification;
 
        public EditTaxonomicTreeOperation(String label, IUndoContext undoContext, TaxonomicTree classification,
index dc7e3438fc856ddf6cb5e66bb33237c92eb3cf63..5138a576f4ab7e61ba5e40e5b716ea3878ac4e79 100644 (file)
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.operations;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.commands.operations.IUndoContext;
 import org.eclipse.core.runtime.IAdaptable;
@@ -27,8 +26,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @version 1.0
  */
 public class EditUserOperation extends AbstractPersistentPostOperation {
-       private static final Logger logger = Logger
-                       .getLogger(EditUserOperation.class);
 
        private User user;
 
index d02972315ccbff2c96438f1e35bfa16cdf35b820..de7fed578f2227206f91d3669ff662c4b29c4eac 100644 (file)
@@ -13,7 +13,6 @@ import java.util.Collections;
 import java.util.List;\r
 import java.util.Set;\r
 \r
-import org.apache.log4j.Logger;\r
 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
 import org.eclipse.core.runtime.IAdaptable;\r
@@ -24,6 +23,7 @@ import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;\r
 import eu.etaxonomy.cdm.model.media.Media;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
+import eu.etaxonomy.taxeditor.store.StoreUtil;\r
 \r
 /**\r
  * @author p.ciardelli\r
@@ -31,9 +31,6 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
  * @version 1.0\r
  */\r
 public class MoveMediaInListOperation extends AbstractPostOperation {\r
-\r
-       private static final Logger logger = Logger\r
-               .getLogger(MoveMediaInListOperation.class);\r
        \r
        public static final int UP = 1;\r
        public static final int DOWN = -1;\r
@@ -99,7 +96,7 @@ public class MoveMediaInListOperation extends AbstractPostOperation {
                Set<DescriptionElementBase> elements = description.getElements();\r
                \r
                if(elements.size() != 1){\r
-                       logger.error("More than one description element in this image gallery");\r
+                       StoreUtil.error(this.getClass(), "More than one description element in this image gallery", null);\r
                }\r
                \r
                DescriptionElementBase element = elements.iterator().next();\r
@@ -117,7 +114,7 @@ public class MoveMediaInListOperation extends AbstractPostOperation {
                        try{\r
                                Collections.swap(medias, newIndex, index);\r
                        }catch(ArrayIndexOutOfBoundsException e){\r
-                               logger.error("", e);\r
+                               StoreUtil.error(this.getClass(), e);\r
                        }\r
                }       \r
        }\r
index 500f16b500cdffb3354dc66f30f3d0e5b3058db0..ea3c07e87dc0a23610e1b96eafb07d7bdbba4c38 100644 (file)
@@ -13,7 +13,6 @@ import java.util.HashMap;
 import java.util.Map;\r
 import java.util.Set;\r
 \r
-import org.apache.log4j.Logger;\r
 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
 import org.eclipse.core.runtime.IAdaptable;\r
@@ -36,8 +35,6 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
  */\r
 public class MoveTaxonOperation extends AbstractPersistentPostOperation {\r
        \r
-       @SuppressWarnings("unused")\r
-       private static final Logger logger = Logger.getLogger(MoveTaxonOperation.class);\r
        /**\r
         * A reference to the new taxonomical parent.\r
         */\r
@@ -82,7 +79,7 @@ public class MoveTaxonOperation extends AbstractPersistentPostOperation {
                                monitor.worked(2);\r
                        }\r
                } catch(IllegalAncestryException e) {\r
-                       StoreUtil.warningDialog("Illegal ancestry", e.getMessage());\r
+                       StoreUtil.warningDialog("Illegal ancestry", this, e.getMessage());\r
                }\r
                monitor.worked(40);\r
                \r
@@ -104,7 +101,7 @@ public class MoveTaxonOperation extends AbstractPersistentPostOperation {
        @Override\r
        public IStatus undo(IProgressMonitor monitor, IAdaptable info)\r
                        throws ExecutionException {\r
-               logger.warn("Not implemented yet.");\r
+               StoreUtil.warn(this.getClass(), "Not implemented yet.");\r
                \r
                // iterate over oldParentTreeNodes, delete each TaxonNode from its actual parent and add to its former parent           \r
                \r
index b0f1cd5a4d8f1bb90584eff6e1a24122a79e49e7..116a161eb43dbc0f4cb799f5d1aa42ece803355f 100644 (file)
@@ -19,7 +19,6 @@ import eu.etaxonomy.cdm.api.utility.ImagesUtility;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;\r
 import eu.etaxonomy.cdm.model.media.ImageFile;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.taxeditor.store.StoreUtil;\r
 \r
 /**\r
  * @author p.ciardelli\r
index 929c802b6ce91ec3e47bfb8e68119fe7aa2ec745..6db91f6ceba2d99fb5d232e4deaaddcf1421359c 100644 (file)
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.operations;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.commands.operations.IUndoContext;
 import org.eclipse.core.runtime.IAdaptable;
@@ -30,9 +29,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  */
 public class SaveClassificationOperation extends AbstractPersistentPostOperation {
 
-       private static final Logger logger = Logger
-                       .getLogger(SaveClassificationOperation.class);
-
        private TaxonomicTree classification;
        
        /**
index 0121778d60307c6d483267c62de565b2a823287a..7576d761e42af12636145e131d5d26b44aa3a7a0 100644 (file)
 
 package eu.etaxonomy.taxeditor.operations;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.commands.operations.IUndoContext;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
 
 /**
  * @author n.hoffmann
@@ -29,8 +28,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @version 1.0
  */
 public class SwapSynonymAndAcceptedOperation extends AbstractPostOperation {
-       private static final Logger logger = Logger
-                               .getLogger(SwapSynonymAndAcceptedOperation.class);
        
        private Synonym synonym;
        // TODO store the old relationship for undo reasons
@@ -81,7 +78,7 @@ public class SwapSynonymAndAcceptedOperation extends AbstractPostOperation {
        @Override
        public IStatus undo(IProgressMonitor monitor, IAdaptable info)
                        throws ExecutionException {
-               logger.error("Not yet implemented");
+               StoreUtil.error(this.getClass(), "Not yet implemented", null);
                return null;
        }
 }
\ No newline at end of file
index 73a5ccab2489c9a073f58a601cfe768170046584..ca1a028626cc47e9ac06874dbe7ba09ba6d0e30d 100644 (file)
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.operations;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.commands.operations.IUndoContext;
 import org.eclipse.core.runtime.IAdaptable;
@@ -28,8 +27,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  */
 public class ToggleUserEnablementOperation extends AbstractPersistentPostOperation {
 
-       private static final Logger logger = Logger
-                       .getLogger(ToggleUserEnablementOperation.class);
        private User user;
 
        /**
index 12abea56037146b29c2bfdab7be65ba40bce6c67..96bd7413569ebd36ccf49957f81ab96fe2eb97b9 100644 (file)
@@ -7,7 +7,6 @@ import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.log4j.Logger;
 import org.eclipse.swt.widgets.Control;
 
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
@@ -20,13 +19,13 @@ import eu.etaxonomy.cdm.strategy.match.MatchException;
 import eu.etaxonomy.cdm.strategy.parser.NonViralNameParserImpl;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
 
 /**
  * @author n.hoffmann
  *
  */
 public class ParseHandler{
-       private static final Logger logger = Logger.getLogger(ParseHandler.class);
 
        private TaxonNameBase taxonNameBase;
        
@@ -149,7 +148,7 @@ public class ParseHandler{
                        unparsedNameString = (String) getText.invoke(textWidget, null);
                } catch (Exception e) {
                        // we should never get here
-                       logger.error("Error trying to invoke getText method");
+                       StoreUtil.error(this.getClass(), "Error trying to invoke getText method", e);
                }
                
                
@@ -240,9 +239,9 @@ public class ParseHandler{
                if(duplicateInReferences.size() > 0){
                        ReferenceBase inReference = (ReferenceBase) duplicateInReferences.iterator().next();
                        reference.setInReference(inReference);
-                       logger.warn(reference.generateTitle());
+                       StoreUtil.warn(this.getClass(), reference.generateTitle());
                        // FIXME TODO resolve multiple duplications. We use first match for a start
-                       logger.warn(reference.getTitleCache());
+                       StoreUtil.warn(this.getClass(), reference.getTitleCache());
                }
        }
        
@@ -315,7 +314,7 @@ public class ParseHandler{
                try{
                        return CdmStore.getCommonService().findMatching(nomenclaturalReference, MatchStrategyConfigurator.ReferenceMatchStrategy());
                }catch (MatchException e) {
-                       logger.error("Error finding matching references", e);
+                       StoreUtil.error(this.getClass(), "Error finding matching references", e);
                }
                return null;
        }
@@ -333,7 +332,7 @@ public class ParseHandler{
                try{
                        return CdmStore.getCommonService().findMatching(authorTeam, MatchStrategyConfigurator.TeamOrPersonMatchStrategy());
                }catch (MatchException e) {
-                       logger.error("Error finding matching authors", e);
+                       StoreUtil.error(this.getClass(), "Error finding matching authors", e);
                }
                return null;
        }
@@ -348,7 +347,7 @@ public class ParseHandler{
                        return CdmStore.getCommonService().findMatching(taxonNameBase, MatchStrategyConfigurator.NonViralNameMatchStrategy());
                        
                } catch (MatchException e) {
-                       logger.error("Error finding matching names", e);
+                       StoreUtil.error(this.getClass(), "Error finding matching names", e);
                }
                return null;
        }
index d3a883e496cc94057e2215ea7e1468ea16b2e33f..a7dbef2aa68a6a0f18fb99d204811a87c919e606 100644 (file)
@@ -12,7 +12,6 @@ package eu.etaxonomy.taxeditor.preference;
 
 import java.util.List;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.preference.PreferencePage;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -39,8 +38,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @version 1.0
  */
 public class DefaultFeatureTreePreferenecs extends PreferencePage implements IWorkbenchPreferencePage {
-       private static final Logger logger = Logger
-                       .getLogger(DefaultFeatureTreePreferenecs.class);
 
        private FeatureTree defaultFeatureTreeForTextualDescription;
        private FeatureTree defaultFeatureTreeForStructuredDescription;
index 79bc8579051ea266ba629f65b7822b23ed5e35bd..809b1ac6716f81e09a200767a3b31c87ac01ebbe 100644 (file)
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.preference;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.preference.PreferencePage;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.wizard.WizardDialog;
@@ -33,8 +32,6 @@ import eu.etaxonomy.taxeditor.featuretree.FeatureTreeEditorWizard;
  */
 public class FeatureTreePreferences extends PreferencePage implements
                IWorkbenchPreferencePage {
-       private static final Logger logger = Logger
-                       .getLogger(FeatureTreePreferences.class);
 
        /**
         * 
index 25cb350945b543f892684271bbc26c368aeca538..5433273f2222474b2ce813e3eea1e48f79b0063a 100644 (file)
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.preference;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.preference.PreferencePage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridLayout;
@@ -26,8 +25,6 @@ import org.eclipse.ui.IWorkbenchPreferencePage;
  */
 public class MatchingPreferences extends PreferencePage implements
        IWorkbenchPreferencePage  {
-       private static final Logger logger = Logger
-                       .getLogger(MatchingPreferences.class);
 
        /* (non-Javadoc)
         * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
index 06d744d4a015c9d87e114ba147d54c10d1e10744..f8b88a92083028fa48de90a7d879370691cf43b5 100644 (file)
@@ -15,7 +15,6 @@ import java.util.List;
 import java.util.Set;\r
 import java.util.UUID;\r
 \r
-import org.apache.log4j.Logger;\r
 import org.eclipse.jface.dialogs.Dialog;\r
 import org.eclipse.jface.dialogs.MessageDialog;\r
 import org.eclipse.jface.preference.IPreferenceStore;\r
@@ -51,6 +50,7 @@ import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;\r
 import eu.etaxonomy.cdm.model.name.Rank;\r
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;\r
+import eu.etaxonomy.cdm.model.occurrence.DeterminationModifier;\r
 import eu.etaxonomy.cdm.model.occurrence.PreservationMethod;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;\r
 import eu.etaxonomy.cdm.strategy.match.DefaultMatchStrategy;\r
@@ -70,8 +70,6 @@ import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
  * @author n.hoffmann\r
  */\r
 public class PreferencesUtil implements IPreferenceKeys{\r
-       private static final Logger logger = Logger\r
-                       .getLogger(PreferencesUtil.class);\r
 \r
        /**\r
         * \r
@@ -147,7 +145,7 @@ public class PreferencesUtil implements IPreferenceKeys{
                                try {\r
                                        matchStrategy.setMatchMode(fieldName, matchMode);\r
                                } catch (MatchException e) {\r
-                                       logger.error(e);\r
+                                       StoreUtil.error(PreferencesUtil.class, e);\r
                                        throw new RuntimeException(e);\r
                                }\r
                        }\r
@@ -302,6 +300,9 @@ public class PreferencesUtil implements IPreferenceKeys{
        /** @return     a {@link List} containing user preferred  {@link Scope} terms  */\r
        public static List<Scope> getPreferredScopes() { return getPreferredTerms(TermStore.getScopes()); }\r
        \r
+       /** @return a {@link List} containing user preferred  {@link DeterminationModifier} terms*/\r
+       public static List<DeterminationModifier> getPreferredDeterminationModifiers() { return getPreferredTerms(TermStore.getDeterminationModifiers()); }\r
+       \r
        /**\r
         * Generic method to set term preferences\r
         * \r
@@ -336,7 +337,7 @@ public class PreferencesUtil implements IPreferenceKeys{
                                . concat(".")\r
                                . concat(cdmBase.getUuid().toString());\r
                if (key.contains("javassist")) {\r
-                       logger.info("proxy");\r
+                       StoreUtil.info(PreferencesUtil.class, "proxy");\r
                }\r
                return key;\r
        }\r
@@ -353,7 +354,7 @@ public class PreferencesUtil implements IPreferenceKeys{
                                . concat(".")\r
                                . concat(definedTerm.getUuid().toString());\r
                if (key.contains("javassist")) {\r
-                       logger.warn("Trying to persist a preference based on a proxy class.");\r
+                       StoreUtil.warn(PreferencesUtil.class, "Trying to persist a preference based on a proxy class.");\r
                }\r
                return key;\r
        }\r
@@ -438,7 +439,7 @@ public class PreferencesUtil implements IPreferenceKeys{
                // First time Editor is opened, no nomenclatural code has been set\r
                if (PreferencesUtil.getPreferredNomenclaturalCode() == null) {\r
 \r
-                       logger.info("No nomencatural code set.");\r
+                       StoreUtil.info(PreferencesUtil.class, "No nomencatural code set.");\r
                        \r
                        Shell shell = StoreUtil.getShell();\r
                        \r
@@ -478,6 +479,5 @@ public class PreferencesUtil implements IPreferenceKeys{
        public static FeatureTree getDefaultFeatureTreeForStructuredDescription() {\r
                String uuidString = getPreferenceStore().getString(FEATURE_TREE_DEFAULT_STRUCTURE);\r
                return CdmUtils.isEmpty(uuidString) ? null : CdmStore.getFeatureTreeService().load(UUID.fromString(uuidString));\r
-       }\r
-       \r
+       }       \r
 }\r
index 3c5c43eb0564d4184eff0ad9753841d58c523ea3..8b14e7d601cad2feee073096e0fda3077d7bab07 100644 (file)
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.preference;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.preference.PreferencePage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
@@ -18,7 +17,6 @@ import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.layout.RowLayout;
@@ -36,8 +34,6 @@ import org.eclipse.ui.IWorkbenchPreferencePage;
  */
 public class TaxonomicEditorGeneralPreferences extends PreferencePage implements
                IWorkbenchPreferencePage {
-       private static final Logger logger = Logger
-                       .getLogger(TaxonomicEditorGeneralPreferences.class);
 
        boolean showUuidInSupplementalView;
 
index 5eab86deed4d8ac6e8cce7baeeab3103db22cd7a..973ef52684c4b9e44be911e37059f8351b90f033 100644 (file)
@@ -15,36 +15,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.ui.IMemento;
 
-import eu.etaxonomy.cdm.model.common.AnnotationType;
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;
-import eu.etaxonomy.cdm.model.common.ExtensionType;
-import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.common.MarkerType;
-import eu.etaxonomy.cdm.model.description.Feature;
-import eu.etaxonomy.cdm.model.description.MeasurementUnit;
-import eu.etaxonomy.cdm.model.description.Modifier;
-import eu.etaxonomy.cdm.model.description.PresenceAbsenceTermBase;
-import eu.etaxonomy.cdm.model.description.Scope;
-import eu.etaxonomy.cdm.model.description.Stage;
-import eu.etaxonomy.cdm.model.description.State;
-import eu.etaxonomy.cdm.model.description.StatisticalMeasure;
-import eu.etaxonomy.cdm.model.location.NamedAreaType;
-import eu.etaxonomy.cdm.model.media.RightsTerm;
-import eu.etaxonomy.cdm.model.name.NameRelationshipType;
-import eu.etaxonomy.cdm.model.name.NameTypeDesignationStatus;
-import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;
-import eu.etaxonomy.cdm.model.name.Rank;
-import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;
-import eu.etaxonomy.cdm.model.occurrence.PreservationMethod;
-import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
 import eu.etaxonomy.taxeditor.model.ContextListenerAdapter;
 import eu.etaxonomy.taxeditor.store.CdmStore;
-import eu.etaxonomy.taxeditor.store.TermStore;
 import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
 
 /**
@@ -53,8 +30,6 @@ import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
  * @version 1.0
  */
 public class TermPreferenceUtil implements IPreferenceKeys{
-       private static final Logger logger = Logger
-                       .getLogger(TermPreferenceUtil.class);
                
        protected static String DISABLED_TERMS = "disabledTerms";
        
index a822dbf897ca45f63781381fbbe0f102f6fbf9a6..ada0c5ee98cd44ff33d29a250c2635c11e3ea61f 100644 (file)
@@ -17,7 +17,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.preference.PreferencePage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
@@ -34,6 +33,7 @@ import eu.etaxonomy.cdm.strategy.match.IMatchStrategy;
 import eu.etaxonomy.cdm.strategy.match.MatchException;
 import eu.etaxonomy.cdm.strategy.match.MatchMode;
 import eu.etaxonomy.taxeditor.parser.MatchStrategyConfigurator;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
 
 /**
  * @author n.hoffmann
@@ -42,8 +42,6 @@ import eu.etaxonomy.taxeditor.parser.MatchStrategyConfigurator;
  */
 public abstract class AbstractMatchingPreferences<T extends IdentifiableEntity> extends PreferencePage implements
                IWorkbenchPreferencePage {
-       private static final Logger logger = Logger
-                       .getLogger(AbstractMatchingPreferences.class);
 
        /**
         * Fields that will be excluded from the display
@@ -136,14 +134,14 @@ public abstract class AbstractMatchingPreferences<T extends IdentifiableEntity>
                 * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)
                 */
                @Override
-               public void widgetSelected(SelectionEvent e) {
-                       super.widgetSelected(e);
+               public void widgetSelected(SelectionEvent event) {
+                       super.widgetSelected(event);
                        MatchMode matchMode = getMatchModeList().get(matchModeCombo.getSelectionIndex());
                        try {
                                matchStrategy.setMatchMode(fieldName, matchMode);
-                       } catch (MatchException exception) {
-                               logger.error(e);
-                               throw new RuntimeException(exception);
+                       } catch (MatchException e) {
+                               StoreUtil.error(this.getClass(), e);
+                               throw new RuntimeException(e);
                        }
                }
        }
@@ -224,7 +222,7 @@ public abstract class AbstractMatchingPreferences<T extends IdentifiableEntity>
                        }
                        
                } catch (MatchException e) {
-                       logger.error(e);
+                       StoreUtil.error(this.getClass(), e);
                        throw new RuntimeException(e);
                }
                super.performDefaults();
index eebb91a523f4bad7c23362f51a1279b6880b8c49..d8c1a2ec56c6b972c6113de66ee7352d133a6fcb 100644 (file)
 
 package eu.etaxonomy.taxeditor.preference.matching;
 
-import org.apache.log4j.Logger;
 import org.eclipse.ui.IWorkbench;
 
 import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.strategy.match.IMatchStrategy;
 import eu.etaxonomy.cdm.strategy.match.MatchException;
 import eu.etaxonomy.taxeditor.parser.MatchStrategyConfigurator;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
 
 /**
  * @author n.hoffmann
@@ -24,8 +24,6 @@ import eu.etaxonomy.taxeditor.parser.MatchStrategyConfigurator;
  * @version 1.0
  */
 public class NonViralNameMatchingPreference extends AbstractMatchingPreferences<NonViralName>{
-       private static final Logger logger = Logger
-                       .getLogger(NonViralNameMatchingPreference.class);
 
        /* (non-Javadoc)
         * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
@@ -36,7 +34,7 @@ public class NonViralNameMatchingPreference extends AbstractMatchingPreferences<
                try {
                        matchStrategy = MatchStrategyConfigurator.NonViralNameMatchStrategy();
                } catch (MatchException e) {
-                       logger.error(e);
+                       StoreUtil.error(this.getClass(), e);
                        throw new RuntimeException(e);
                }
        }
index 2fe30fd5e288f2c5a67845b48dd751a44d61e838..453c9ee4ee76425b25f8aecb8a5ee4757a855127 100644 (file)
 
 package eu.etaxonomy.taxeditor.preference.matching;
 
-import org.apache.log4j.Logger;
 import org.eclipse.ui.IWorkbench;
 
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;
 import eu.etaxonomy.cdm.strategy.match.IMatchStrategy;
 import eu.etaxonomy.cdm.strategy.match.MatchException;
 import eu.etaxonomy.taxeditor.parser.MatchStrategyConfigurator;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
 
 /**
  * @author n.hoffmann
@@ -24,8 +24,6 @@ import eu.etaxonomy.taxeditor.parser.MatchStrategyConfigurator;
  * @version 1.0
  */
 public class ReferenceMatchingPreference extends AbstractMatchingPreferences<ReferenceBase> {
-       private static final Logger logger = Logger
-                       .getLogger(ReferenceMatchingPreference.class);
 
        /* (non-Javadoc)
         * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
@@ -36,7 +34,7 @@ public class ReferenceMatchingPreference extends AbstractMatchingPreferences<Ref
                try {
                        matchStrategy = MatchStrategyConfigurator.ReferenceMatchStrategy();
                } catch (MatchException e) {
-                       logger.error(e);
+                       StoreUtil.error(this.getClass(), e);
                        throw new RuntimeException(e);
                }
        }
index a68c676e4dcee98d537c514b36b0a47f22c91d55..45283f8067519e7cb066b07462df5d1acccd083c 100644 (file)
 
 package eu.etaxonomy.taxeditor.preference.matching;
 
-import org.apache.log4j.Logger;
 import org.eclipse.ui.IWorkbench;
 
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
 import eu.etaxonomy.cdm.strategy.match.IMatchStrategy;
 import eu.etaxonomy.cdm.strategy.match.MatchException;
 import eu.etaxonomy.taxeditor.parser.MatchStrategyConfigurator;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
 
 /**
  * @author n.hoffmann
@@ -25,8 +25,6 @@ import eu.etaxonomy.taxeditor.parser.MatchStrategyConfigurator;
  */
 public class TeamOrPersonMatchingPreference extends
                AbstractMatchingPreferences<TeamOrPersonBase> {
-       private static final Logger logger = Logger
-                       .getLogger(TeamOrPersonMatchingPreference.class);
 
        /* (non-Javadoc)
         * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
@@ -38,7 +36,7 @@ public class TeamOrPersonMatchingPreference extends
                try {
                        matchStrategy = MatchStrategyConfigurator.TeamOrPersonMatchStrategy();
                } catch (MatchException e) {
-                       logger.error(e);
+                       StoreUtil.error(this.getClass(), e);
                        throw new RuntimeException(e);
                }
        }       
index c06c297f5ad61288f1627a4ce1e9a49d739d1d18..8c5bbaa1cf559eafbb87e040502f0e3770e1196d 100644 (file)
@@ -13,7 +13,6 @@ package eu.etaxonomy.taxeditor.preference.menu;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Set;
 
 import org.eclipse.jface.preference.PreferencePage;
 import org.eclipse.jface.viewers.CheckboxTableViewer;
@@ -164,7 +163,7 @@ public abstract class AbstractMenuPreferences<T extends DefinedTermBase> extends
                        @Override
                        public void widgetSelected(SelectionEvent e) {
                                super.widgetSelected(e);
-                               StoreUtil.notImplementedMessage();
+                               StoreUtil.notImplementedMessage(this);
                        }
                });
        }
@@ -181,7 +180,7 @@ public abstract class AbstractMenuPreferences<T extends DefinedTermBase> extends
                        @Override
                        public void widgetSelected(SelectionEvent e) {
                                super.widgetSelected(e);
-                               StoreUtil.notImplementedMessage();
+                               StoreUtil.notImplementedMessage(this);
                        }
                });
        }
@@ -198,7 +197,7 @@ public abstract class AbstractMenuPreferences<T extends DefinedTermBase> extends
                        @Override
                        public void widgetSelected(SelectionEvent e) {
                                super.widgetSelected(e);
-                               StoreUtil.notImplementedMessage();
+                               StoreUtil.notImplementedMessage(this);
                        }
                });
        }
index 61af9402861d9abd04f399f64b5ae90b37b281e0..1089a7f69dabaf12efab0c7858ea8ac7152b6f00 100644 (file)
@@ -11,9 +11,7 @@
 package eu.etaxonomy.taxeditor.preference.menu;
 
 import java.util.Collection;
-import java.util.Set;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.Viewer;
 
@@ -26,8 +24,6 @@ import eu.etaxonomy.cdm.model.common.DefinedTermBase;
  */
 public class DefinedTermBaseContentProvider implements
                IStructuredContentProvider {
-       private static final Logger logger = Logger
-                       .getLogger(DefinedTermBaseContentProvider.class);
 
        public Object[] getElements(Object inputElement) {      
                if(inputElement instanceof Collection){
index d3c71bd2679c85af74bcb1ac3d8e0ad45be9a57f..3f08b68713742ca427b6ee2e8f85cf400f7cfac5 100644 (file)
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.preference.menu;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.swt.graphics.Image;
@@ -24,8 +23,6 @@ import eu.etaxonomy.cdm.model.common.DefinedTermBase;
  */
 public class DefinedTermBaseLabelProvider extends LabelProvider implements
                ITableLabelProvider {
-       private static final Logger logger = Logger
-                       .getLogger(DefinedTermBaseLabelProvider.class);
 
        /* (non-Javadoc)
         * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
index 254a867195150c0fc8d926c73ec0112d7ef905b0..4b29719544f1aa9b5772cc427b8c7c0373923672 100644 (file)
@@ -10,9 +10,7 @@
 
 package eu.etaxonomy.taxeditor.preference.menu;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 
@@ -28,9 +26,7 @@ import eu.etaxonomy.taxeditor.store.TermStore;
  * @version 1.0
  */
 public class ExtensionTypeMenuPreferences extends AbstractMenuPreferences<ExtensionType> {
-       private static final Logger logger = Logger
-                       .getLogger(ExtensionTypeMenuPreferences.class);
-       
+
        /**
         * 
         */
index 5c0f09afc6223801f2653ec08f561d74a4dce169..fc9b97f01d18b3352f45b74331d680a5c4e69e9f 100644 (file)
@@ -10,8 +10,6 @@ package eu.etaxonomy.taxeditor.preference.menu;
 
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 
index 85351fecf7267315cb239b313fdef4e9dcbc8b0f..f8ade8caeab96c859561591b9502e235a81cba6b 100644 (file)
 
 package eu.etaxonomy.taxeditor.preference.menu;
 
-import java.util.Set;
-
-import org.apache.log4j.Logger;
-
 import eu.etaxonomy.cdm.model.common.MarkerType;
 import eu.etaxonomy.taxeditor.store.TermStore;
 
@@ -24,10 +20,6 @@ import eu.etaxonomy.taxeditor.store.TermStore;
  */
 public class MarkerTypeMenuPreferences extends AbstractMenuPreferences<MarkerType>{
 
-
-       private static final Logger logger = Logger
-                       .getLogger(MarkerTypeMenuPreferences.class);
-       
        /**
         * @param initialVocabulary
         * @param title
index 6051a196ca4c076941571957618c8707a96b064f..548e6e3c36fa0881c7eaca00a4229978eaf69feb 100644 (file)
@@ -10,8 +10,6 @@
 
 package eu.etaxonomy.taxeditor.preference.menu;
 
-import org.apache.log4j.Logger;
-
 import eu.etaxonomy.cdm.model.location.NamedAreaType;
 import eu.etaxonomy.taxeditor.store.TermStore;
 
@@ -22,9 +20,6 @@ import eu.etaxonomy.taxeditor.store.TermStore;
  */
 public class NamedAreaTypeMenuPreferences extends AbstractMenuPreferences<NamedAreaType> {
 
-       private static final Logger logger = Logger
-                       .getLogger(NamedAreaTypeMenuPreferences.class);
-       
        public NamedAreaTypeMenuPreferences() {
                super(TermStore.getNamedAreaTypes(), 
                                "Named Area Types", 
index 9272c1933d35619d5abed8274079c4991ece15d6..e0de71d61f019bd07e688e45519cf21960e520ff 100644 (file)
@@ -23,7 +23,6 @@ import eu.etaxonomy.taxeditor.store.TermStore;
 public class PresenceAbsenceMenuPreferences extends AbstractMenuPreferences<PresenceAbsenceTermBase> implements
                IWorkbenchPreferencePage {
 
-
        /**
         * @param initialVocabulary
         * @param preferedTerms
index f6e7c1dbcdbaf2ad141ed811fbfd6533fc885f90..376616f7b20b2dd9baca033da02fb9ba8f07f623 100644 (file)
@@ -10,8 +10,6 @@
 
 package eu.etaxonomy.taxeditor.preference.menu;
 
-import org.apache.log4j.Logger;
-
 import eu.etaxonomy.cdm.model.occurrence.PreservationMethod;
 import eu.etaxonomy.taxeditor.store.TermStore;
 
@@ -22,9 +20,6 @@ import eu.etaxonomy.taxeditor.store.TermStore;
  */
 public class PreservationMethodMenuPreferences extends AbstractMenuPreferences<PreservationMethod> {
        
-       private static final Logger logger = Logger
-                       .getLogger(PreservationMethodMenuPreferences.class);
-       
        public PreservationMethodMenuPreferences() {
                super(TermStore.getPreservationMethods(), 
                                "Preservation Method Preferences", 
index d570b7f7c288bf2f7324a3bf5f57d613ba6984fd..fb7d8fd5a2b6b63e648a12a6fcb3082be953d85e 100644 (file)
 
 package eu.etaxonomy.taxeditor.preference.menu;
 
-import java.util.Set;
-
-import org.apache.log4j.Logger;
-
 import eu.etaxonomy.cdm.model.description.Stage;
 import eu.etaxonomy.taxeditor.store.TermStore;
 
@@ -23,9 +19,6 @@ import eu.etaxonomy.taxeditor.store.TermStore;
  * @version 1.0
  */
 public class StageMenuPreferences extends AbstractMenuPreferences<Stage> {
-
-       private static final Logger logger = Logger
-                       .getLogger(StageMenuPreferences.class);
        
        public StageMenuPreferences() {
                super(TermStore.getStages(), 
index 5e301f3b48ad9929bb20a1dfdf79e51d4c25e2f2..1f8251dfaf2c7bb3912406bbe582b63c6178afce 100644 (file)
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.preference.wizard;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.wizard.Wizard;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
@@ -18,6 +17,7 @@ import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.Representation;
 import eu.etaxonomy.cdm.model.common.VocabularyEnum;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.taxeditor.store.TermStore;
 
 /**
@@ -26,7 +26,6 @@ import eu.etaxonomy.taxeditor.store.TermStore;
  * @version 1.0
  */
 public class VocabularyTermWizard<T extends DefinedTermBase> extends Wizard {
-       private static final Logger logger = Logger.getLogger(VocabularyTermWizard.class);
        
        public T term = null;
        
@@ -113,9 +112,9 @@ public class VocabularyTermWizard<T extends DefinedTermBase> extends Wizard {
                        }
                        
                } catch (InstantiationException e) {
-                       logger.error("InstantiationException when setting term", e);
+                       StoreUtil.error(this.getClass(), "InstantiationException when setting term", e);
                } catch (IllegalAccessException e) {
-                       logger.error("IllegalAccessException when setting term", e);
+                       StoreUtil.error(this.getClass(), "IllegalAccessException when setting term", e);
                }
                
        }
index 60c70fcdbe4b3db69bcc3fba7888273e4e135244..8d45fd7e8c0e33a040b393092b49a6cd8d7653f5 100644 (file)
@@ -11,7 +11,6 @@
 package eu.etaxonomy.taxeditor.preference.wizard;
 
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
@@ -44,9 +43,6 @@ public class VocabularyTermWizardPage<T extends DefinedTermBase> extends WizardP
                super("VOCABULARY_TERM_WIZARD_PAGE");           
        }
 
-       private static final Logger logger = Logger
-                       .getLogger(VocabularyTermWizardPage.class);
-
        /* (non-Javadoc)
         * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
         */
@@ -108,7 +104,6 @@ public class VocabularyTermWizardPage<T extends DefinedTermBase> extends WizardP
         * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent)
         */
        public void modifyText(ModifyEvent e) {
-               logger.warn("modified");
                if(text_label.getText().length() > 0){
                        setPageComplete(true);
                                
index f2ecf32716e015835aadbc4a4a73fb40ab2925a2..172ee01edd51d30783b61246652bb6551c308d2c 100644 (file)
@@ -16,7 +16,6 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.dialogs.ProgressMonitorDialog;
 import org.eclipse.jface.operation.IRunnableWithProgress;
@@ -78,7 +77,6 @@ import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
  * @version 1.0
  */
 public class CdmStore{
-       private static final Logger logger = Logger.getLogger(CdmStore.class);
        
        private static class CdmDataStoreConnector implements IRunnableWithProgress{
                private ICdmDataSource dataSource;
@@ -131,7 +129,7 @@ public class CdmStore{
                                try{
                                        applicationController = CdmApplicationController.NewInstance(applicationContextBean, dataSource, dbSchemaValidation, false, subprogressMonitor);
                                }catch(Exception e){
-                                       logger.error(e);
+                                       StoreUtil.error(this.getClass(), e.getMessage(), e);
                                }
                        }
                        
@@ -141,7 +139,7 @@ public class CdmStore{
                                getContextManager().notifyContextStart(monitor);
                                
                                monitor.done();
-                               logger.info("Application context initialized.");        
+                               StoreUtil.info(this.getClass(), "Application context initialized.");    
                        }else{
                                // Show datasource view if not shown yet
                                StoreUtil.showView(CdmDataSourceViewPart.ID);
@@ -186,9 +184,9 @@ public class CdmStore{
                        
                        if(!result){
                                // Show an error message
-                               StoreUtil.errorDialog("DatabaseCompatibilityCheck failed", "The database schema for the chosen " +
+                               StoreUtil.errorDialog("DatabaseCompatibilityCheck failed", this, "The database schema for the chosen " +
                                                "datasource '" + dataSource + "' \n is not valid for this version of the taxonomic editor. \n" +
-                                               "Please update the chosen datasource or choose a new data source to connect to in the Datasource View.");
+                                               "Please update the chosen datasource or choose a new data source to connect to in the Datasource View.", null);
                        
                                monitor.setCanceled(true);
                        }                                       
@@ -209,8 +207,8 @@ public class CdmStore{
                                                return;
                                        }                                       
                                } catch (SQLException e) {
-                                       StoreUtil.errorDialog("Error while trying to retrieve database metadata", "Something is utterly wrong with your database.");
-                                       logger.error(e);
+                                       StoreUtil.errorDialog("Error while trying to retrieve database metadata", this, "Something is utterly wrong with your database.", e);
+                                       StoreUtil.error(this.getClass(), e.getMessage(), e);
                                }
                        }
                        
@@ -223,10 +221,10 @@ public class CdmStore{
                                dataSource.testConnection();
                                monitor.worked(1);
                        } catch (ClassNotFoundException e) {
-                               StoreUtil.errorDialog("Could not connect to chosen datasource", "Reason: " + e.getMessage());
+                               StoreUtil.errorDialog("Could not connect to chosen datasource", this, "Reason: " + e.getMessage(), e);
                                monitor.setCanceled(true);
                        } catch (SQLException e) {
-                               StoreUtil.errorDialog("Could not connect to chosen datasource", "Reason: " + e.getMessage());
+                               StoreUtil.errorDialog("Could not connect to chosen datasource", this, "Reason: " + e.getMessage(), e);
                                monitor.setCanceled(true);
                        }
                        
@@ -271,7 +269,7 @@ public class CdmStore{
                        return instance;
                }else if(!instance.isConnected){
                        
-                       StoreUtil.warningDialog("No datasource connection", "Application is not connected to a datastore.");
+                       StoreUtil.warningDialog("No datasource connection", instance, "Application is not connected to a datastore.");
                        
                        StoreUtil.showView(CdmDataSourceViewPart.ID);
                        
@@ -306,15 +304,15 @@ public class CdmStore{
         * @param applicationContextBean
         */
        private static void connect(final ICdmDataSource datasource, final DbSchemaValidation dbSchemaValidation, final Resource applicationContextBean){       
-               logger.info("Connecting to datasource: " + datasource);
+               StoreUtil.info(CdmStore.class, "Connecting to datasource: " + datasource);
                
                try {
                        ProgressMonitorDialog dialog = new ProgressMonitorDialog(StoreUtil.getShell());
                        dialog.run(false, true, new CdmDataStoreConnector(datasource, dbSchemaValidation, applicationContextBean));
                } catch (InvocationTargetException e) {
-                       logger.error(e);
+                       StoreUtil.error(CdmStore.class, e);
                } catch (InterruptedException e) {
-                       logger.error(e);
+                       StoreUtil.error(CdmStore.class, e);
                }               
                
        }
@@ -360,7 +358,7 @@ public class CdmStore{
                try{
                        return applicationController;
                }catch(Exception e){
-                       logger.error("Exception thrown", e);
+                       StoreUtil.error(CdmStore.class, e);
                }
                return null;
        }
index 7d2a1b898fef2151bdde6d4fbf2dcabf6533b9fc..a06c28d6b041ba45e1249fb2fac378905a76feeb 100644 (file)
@@ -13,21 +13,14 @@ package eu.etaxonomy.taxeditor.store;
 import java.io.File;
 import java.io.FileNotFoundException;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubMonitor;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IMemento;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchListener;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.XMLMemento;
-import org.eclipse.ui.progress.UIJob;
 
 import eu.etaxonomy.taxeditor.model.IContextListener;
 import eu.etaxonomy.taxeditor.model.MementoHelper;
@@ -41,7 +34,6 @@ import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
  * @version 1.0
  */
 public class ContextManager implements IWorkbenchListener{
-       private static final Logger logger = Logger.getLogger(ContextManager.class);
        
        private ListenerList contextListeners = new ListenerList();
 
@@ -63,7 +55,7 @@ public class ContextManager implements IWorkbenchListener{
                IProgressMonitor subMonitor = StoreUtil.getSubProgressMonitor(monitor, 1);
 
                subMonitor.beginTask("Starting context", contextListeners.size());
-               logger.info("Notifying context listeners, that the context has started.");
+               StoreUtil.info(this.getClass(), "Notifying context listeners, that the context has started.");
                                
                readMemento();                          
                
@@ -96,7 +88,7 @@ public class ContextManager implements IWorkbenchListener{
                IProgressMonitor subMonitor = StoreUtil.getSubProgressMonitor(monitor, 1);
 
                subMonitor.beginTask("Stoping context", contextListeners.size());
-               logger.info("Notifying context listeners, that the context has stopped.");
+               StoreUtil.info(this.getClass(), "Notifying context listeners, that the context has stopped.");
                                
                for(Object listener : contextListeners.getListeners()){
                        ((IContextListener) listener).contextStop(memento, subMonitor);
@@ -141,7 +133,7 @@ public class ContextManager implements IWorkbenchListener{
                        memento = MementoHelper.readMementoFromFile(getStateFileForCurrentDatabase());
                } catch (FileNotFoundException e) {
                        // no memento -> no previous state
-                       logger.info("No state file for datasource");
+                       StoreUtil.info(this.getClass(), "No state file for datasource");
                }
        }
        
@@ -152,13 +144,13 @@ public class ContextManager implements IWorkbenchListener{
                        try {
                                memento = XMLMemento.createWriteRoot(CdmStore.getDataSource().getName());
                        
-                               logger.info("DataSource found. Memento created.");
+                               StoreUtil.info(this.getClass(), "DataSource found. Memento created.");
                        } catch (Exception e) {
                                // The memento could not be created, but a not closable editor is avoided for this case.
-                               logger.error("The memento could not be created: " + e.getMessage());
+                               StoreUtil.error(this.getClass(), "The memento could not be created", e);
                        }
                } else {
-                       logger.info("Not storing state data, because no DataSource present.");
+                       StoreUtil.info(this.getClass(), "Not storing state data, because no DataSource present.");
                }
                
        }
index dbb4cc2935ae0d73be5aba5d5a870c5c83374b3b..24ebcf54ca61709954b7be3c4500bfd54433e9e9 100644 (file)
@@ -12,7 +12,6 @@ package eu.etaxonomy.taxeditor.store;
 
 import java.util.Observable;
 
-import org.apache.log4j.Logger;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -25,7 +24,6 @@ import eu.etaxonomy.cdm.model.common.User;
  * @version 1.0
  */
 public class LoginManager extends Observable{
-       private static final Logger logger = Logger.getLogger(LoginManager.class);
        
        /**
         * @param token
index 277d679555e24031a8dbe33b6788f9acf8f596b5..eb17e9e7003af1c21a88f7348282314b999b195f 100644 (file)
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.store;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.ui.IMemento;
 
@@ -23,8 +22,6 @@ import eu.etaxonomy.taxeditor.model.ContextListenerAdapter;
  * @version 1.0
  */
 public class StoreStateManager extends ContextListenerAdapter {
-       private static final Logger logger = Logger
-                       .getLogger(StoreStateManager.class);
 
        /* (non-Javadoc)
         * @see eu.etaxonomy.taxeditor.model.IContextListener#contextStart(org.eclipse.ui.IMemento, org.eclipse.core.runtime.IProgressMonitor)
index c57534ae64bee3b1e7b45c45e0bb6838fd2ad3bb..f3ca5704e644caeb26cfec6e7a6dc06fec06b3fb 100644 (file)
@@ -47,5 +47,7 @@ public class StoreUtil extends AbstractUtility {
                return IOperationHistory.GLOBAL_UNDO_CONTEXT;
        }
        
-       
+       protected static String getPluginId(){
+               return TaxeditorStorePlugin.PLUGIN_ID;
+       }
 }
index 2b6132a654482fbac6c549a9ca9b931f3abc04db..bc1279edde24a70d1f59e11a01c174df48ba1acb 100644 (file)
@@ -42,6 +42,7 @@ import eu.etaxonomy.cdm.model.name.NameTypeDesignationStatus;
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;
 import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;
+import eu.etaxonomy.cdm.model.occurrence.DeterminationModifier;
 import eu.etaxonomy.cdm.model.occurrence.PreservationMethod;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
 
@@ -250,6 +251,13 @@ public class TermStore {
                return getTerms(Scope.class);
        }
        
+       /**
+        * @return
+        */
+       public static List<DeterminationModifier> getDeterminationModifiers() {
+               return getTerms(DeterminationModifier.class);
+       }
+       
        /*************** save methods ******************************/
        /**
         * Adds a term to a vocabulary
@@ -313,7 +321,4 @@ public class TermStore {
                return terms;
                
        }
-
-
-
 }
index d4e750d591c4981fd0c2aef25fb654fdec279801..a32a4414adb8388b3b90ade35764c368a5de64a4 100644 (file)
@@ -1,6 +1,5 @@
 package eu.etaxonomy.taxeditor.store.internal;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.resource.ImageRegistry;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -14,8 +13,6 @@ import eu.etaxonomy.taxeditor.store.StoreStateManager;
  * The activator class controls the plug-in life cycle
  */
 public class TaxeditorStorePlugin extends AbstractUIPlugin {
-
-       public static final Logger logger = Logger.getLogger(TaxeditorStorePlugin.class);
        
        // The plug-in ID
        public static final String PLUGIN_ID = "eu.etaxonomy.taxeditor.editor";
@@ -42,8 +39,6 @@ public class TaxeditorStorePlugin extends AbstractUIPlugin {
                plugin = this;
 
                PreferencesUtil.setDefaults();
-               
-               logger.trace("Plugin started: " + this.getBundle().getSymbolicName());
        }
 
        /*
@@ -53,7 +48,6 @@ public class TaxeditorStorePlugin extends AbstractUIPlugin {
        public void stop(BundleContext context) throws Exception {
                plugin = null;
                super.stop(context);
-               logger.trace("Plugin stopped");
        }
 
        /**
@@ -83,11 +77,4 @@ public class TaxeditorStorePlugin extends AbstractUIPlugin {
        public ImageRegistry createImageRegistry(){
                return super.createImageRegistry();
        }
-       
-       /************************ ERROR CODES ****************************/
-       
-       /**
-        * An attempt was made to save a taxon with a zero length name
-        */
-       public static final int ERROR_SAVING_ZERO_NAME = 52000;
 }
index bc92c6d7579e65f511e5ce3ff33e42c75d45ab0a..2acfae70533ea26072875b621ed280f5caef5c34 100644 (file)
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.user.handler;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
@@ -27,8 +26,6 @@ import eu.etaxonomy.taxeditor.user.wizard.UserWizard;
  * @version 1.0
  */
 public class CreateUserHandler extends AbstractHandler {
-       private static final Logger logger = Logger
-                       .getLogger(CreateUserHandler.class);
 
        /* (non-Javadoc)
         * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
index e6bf32fe229172dea6a079da103588dd00e1627d..152b90e528821e287e0bcae2b709508ae72aaae3 100644 (file)
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.user.handler;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
@@ -29,8 +28,6 @@ import eu.etaxonomy.taxeditor.user.wizard.UserWizard;
  * @version 1.0
  */
 public class EditUserHandler extends AbstractHandler {
-       private static final Logger logger = Logger
-                       .getLogger(EditUserHandler.class);
 
        /* (non-Javadoc)
         * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
index fc5438caa2d0a1fb64d6c220a6396f21e1c5a04b..72fefa154f933d19e1515b609963850215680f5d 100644 (file)
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.user.handler;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
@@ -30,8 +29,6 @@ import eu.etaxonomy.taxeditor.user.view.UserManagerView;
  * @version 1.0
  */
 public class ToggleUserEnablementHandler extends AbstractHandler {
-       private static final Logger logger = Logger
-                       .getLogger(ToggleUserEnablementHandler.class);
 
        /* (non-Javadoc)
         * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
@@ -54,7 +51,7 @@ public class ToggleUserEnablementHandler extends AbstractHandler {
                                
                                StoreUtil.executeOperation(operation);
                        } catch (NotDefinedException e) {
-                               logger.warn("Command name not set");
+                               StoreUtil.warn(this.getClass(), "Command name not set");
                        }
                }
 
index e8bcf484affdd55d06d1a3d55d1a475663a7b63e..84f50b4bb6d97a8007a9062f5d21b7f87966be79 100644 (file)
@@ -12,7 +12,6 @@ package eu.etaxonomy.taxeditor.user.view;
 
 import java.util.List;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.Viewer;
 
@@ -24,8 +23,6 @@ import eu.etaxonomy.cdm.model.common.User;
  * @version 1.0
  */
 public class UserManagerContentProvider implements IStructuredContentProvider {
-       private static final Logger logger = Logger
-                       .getLogger(UserManagerContentProvider.class);
 
        /* (non-Javadoc)
         * @see org.eclipse.jface.viewers.IContentProvider#dispose()
index 0794ac99833cdb278dbc4ff97715743032f4168a..407943c4082e4bc7506c94f537824187f0421a61 100644 (file)
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.user.view;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.swt.graphics.Image;
@@ -25,8 +24,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @version 1.0
  */
 public class UserManagerLabelProvider extends LabelProvider implements ITableLabelProvider {
-       private static final Logger logger = Logger
-                       .getLogger(UserManagerLabelProvider.class);
 
        public Image getColumnImage(Object element, int columnIndex) {
                return null;
index 02a1bb3eff538bc6043d2d0c684700b8dd75aa36..0c992311b2637c0219c3010cdf2f21ae61583b58 100644 (file)
@@ -12,7 +12,6 @@ package eu.etaxonomy.taxeditor.user.view;
 
 import java.util.List;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.action.GroupMarker;
 import org.eclipse.jface.action.MenuManager;
@@ -46,8 +45,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @version 1.0
  */
 public class UserManagerView extends ViewPart implements IConversationEnabled, IPostOperationEnabled{
-       private static final Logger logger = Logger
-                       .getLogger(UserManagerView.class);
        
        private class ContextListener extends ContextListenerAdapter{
 
index c440b4ed1e74e9eeb0644985f090ca5ec71ccc1b..6fe5c5dc8a6ac6a95ab0bc68ba14d663af2122b3 100644 (file)
@@ -10,8 +10,6 @@
 
 package eu.etaxonomy.taxeditor.user.wizard;
 
-import org.apache.log4j.Logger;
-import org.eclipse.core.commands.operations.IUndoableOperation;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.wizard.Wizard;
 
@@ -28,7 +26,6 @@ import eu.etaxonomy.taxeditor.user.view.UserManagerView;
  * @version 1.0
  */
 public class UserWizard extends Wizard {
-       private static final Logger logger = Logger.getLogger(UserWizard.class);
        private User user;
        private UserWizardPage page;
        private UserManagerView view;
index b4535466855c3512659069414be08fe49d92bf61..d58e57c4512be44b5deaad9119c58c0cd74b4697 100644 (file)
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.user.wizard;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.dialogs.IInputValidator;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;