merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Mon, 20 Jan 2014 08:51:06 +0000 (08:51 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Mon, 20 Jan 2014 08:51:06 +0000 (08:51 +0000)
26 files changed:
eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.application/pom.xml
eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.bulkeditor/pom.xml
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.editor/pom.xml
eu.etaxonomy.taxeditor.feature.platform/feature.xml
eu.etaxonomy.taxeditor.feature.platform/pom.xml
eu.etaxonomy.taxeditor.feature/feature.xml
eu.etaxonomy.taxeditor.feature/pom.xml
eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.help/pom.xml
eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.navigation/pom.xml
eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.printpublisher/pom.xml
eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.store/pom.xml
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonBaseDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/UpdateDataSourceHandler.java
eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
eu.etaxonomy.taxeditor/pom.xml
pom.xml

index 5b1f9e061d55719dab90754db87e383746a466bb..d912362804b95761c069955fb9c6542e97c99cc7 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Application
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true
-Bundle-Version: 3.3.0.qualifier
+Bundle-Version: 3.3.0.201401161011
 Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: plugin
index b53e2804011320d34e848e0d5e6622baf74df9e2..ac5342979881c01d383d143b0dd9909b53b40ae7 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.3.0-SNAPSHOT</version>
+               <version>3.3.0.201401161011</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 61c72751cc72b36ce68409254b0675f6cd9f04e1..4156ee903497de2c067a7e3ff04aaf2f41013cfd 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Bulkeditor Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.bulkeditor;singleton:=true
-Bundle-Version: 3.3.0.qualifier
+Bundle-Version: 3.3.0.201401161011
 Bundle-Activator: eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor,
index f499633e8da78d3827d7dccc7126e584abe40bb6..01c76398238f3552eeeb879816274df07a97d686 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.3.0-SNAPSHOT</version>
+               <version>3.3.0.201401161011</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 3fb4ffb0f58e4c31c1f30461d1e9ac719287370d..56e85c9b481dc4dd4642e65cc79c220938046485 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CDM Library Dependencies Plugin
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.cdmlib;singleton:=true
-Bundle-Version: 3.3.0.qualifier
+Bundle-Version: 3.3.0.201401161011
 Eclipse-BundleShape: dir
 Export-Package: com.google.api,
  com.google.api.detect,
@@ -421,22 +421,22 @@ Bundle-ClassPath: .,
  lib/batik-util-1.7.jar,
  lib/batik-xml-1.7.jar,
  lib/c3p0-0.9.2.jar,
- lib/cdmlib-commons-3.3.0-SNAPSHOT-sources.jar,
- lib/cdmlib-commons-3.3.0-SNAPSHOT.jar,
- lib/cdmlib-ext-3.3.0-SNAPSHOT-sources.jar,
- lib/cdmlib-ext-3.3.0-SNAPSHOT.jar,
- lib/cdmlib-io-3.3.0-SNAPSHOT-sources.jar,
- lib/cdmlib-io-3.3.0-SNAPSHOT.jar,
- lib/cdmlib-model-3.3.0-SNAPSHOT-sources.jar,
- lib/cdmlib-model-3.3.0-SNAPSHOT.jar,
- lib/cdmlib-persistence-3.3.0-SNAPSHOT-sources.jar,
- lib/cdmlib-persistence-3.3.0-SNAPSHOT.jar,
- lib/cdmlib-print-3.3.0-SNAPSHOT-sources.jar,
- lib/cdmlib-print-3.3.0-SNAPSHOT.jar,
- lib/cdmlib-remote-3.3.0-SNAPSHOT-sources.jar,
- lib/cdmlib-remote-3.3.0-SNAPSHOT.jar,
- lib/cdmlib-services-3.3.0-SNAPSHOT-sources.jar,
- lib/cdmlib-services-3.3.0-SNAPSHOT.jar,
+ lib/cdmlib-commons-3.3.0-sources.jar,
+ lib/cdmlib-commons-3.3.0.jar,
+ lib/cdmlib-ext-3.3.0-sources.jar,
+ lib/cdmlib-ext-3.3.0.jar,
+ lib/cdmlib-io-3.3.0-sources.jar,
+ lib/cdmlib-io-3.3.0.jar,
+ lib/cdmlib-model-3.3.0-sources.jar,
+ lib/cdmlib-model-3.3.0.jar,
+ lib/cdmlib-persistence-3.3.0-sources.jar,
+ lib/cdmlib-persistence-3.3.0.jar,
+ lib/cdmlib-print-3.3.0-sources.jar,
+ lib/cdmlib-print-3.3.0.jar,
+ lib/cdmlib-remote-3.3.0-sources.jar,
+ lib/cdmlib-remote-3.3.0.jar,
+ lib/cdmlib-services-3.3.0-sources.jar,
+ lib/cdmlib-services-3.3.0.jar,
  lib/cglib-nodep-2.2.2.jar,
  lib/com.springsource.org.aopalliance-1.0.0.jar,
  lib/com.springsource.org.apache.commons.logging-1.1.1.jar,
index f1fbc5b03f88720a74aa2e8621cd53e7679dc8a1..15b3e9f19468dbf65277ef183aabbd38339c59d1 100644 (file)
@@ -22,22 +22,22 @@ bin.includes = META-INF/,\
                lib/batik-util-1.7.jar,\\r
                lib/batik-xml-1.7.jar,\\r
                lib/c3p0-0.9.2.jar,\\r
-               lib/cdmlib-commons-3.3.0-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-commons-3.3.0-SNAPSHOT.jar,\\r
-               lib/cdmlib-ext-3.3.0-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-ext-3.3.0-SNAPSHOT.jar,\\r
-               lib/cdmlib-io-3.3.0-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-io-3.3.0-SNAPSHOT.jar,\\r
-               lib/cdmlib-model-3.3.0-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-model-3.3.0-SNAPSHOT.jar,\\r
-               lib/cdmlib-persistence-3.3.0-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-persistence-3.3.0-SNAPSHOT.jar,\\r
-               lib/cdmlib-print-3.3.0-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-print-3.3.0-SNAPSHOT.jar,\\r
-               lib/cdmlib-remote-3.3.0-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-remote-3.3.0-SNAPSHOT.jar,\\r
-               lib/cdmlib-services-3.3.0-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-services-3.3.0-SNAPSHOT.jar,\\r
+               lib/cdmlib-commons-3.3.0-sources.jar,\\r
+               lib/cdmlib-commons-3.3.0.jar,\\r
+               lib/cdmlib-ext-3.3.0-sources.jar,\\r
+               lib/cdmlib-ext-3.3.0.jar,\\r
+               lib/cdmlib-io-3.3.0-sources.jar,\\r
+               lib/cdmlib-io-3.3.0.jar,\\r
+               lib/cdmlib-model-3.3.0-sources.jar,\\r
+               lib/cdmlib-model-3.3.0.jar,\\r
+               lib/cdmlib-persistence-3.3.0-sources.jar,\\r
+               lib/cdmlib-persistence-3.3.0.jar,\\r
+               lib/cdmlib-print-3.3.0-sources.jar,\\r
+               lib/cdmlib-print-3.3.0.jar,\\r
+               lib/cdmlib-remote-3.3.0-sources.jar,\\r
+               lib/cdmlib-remote-3.3.0.jar,\\r
+               lib/cdmlib-services-3.3.0-sources.jar,\\r
+               lib/cdmlib-services-3.3.0.jar,\\r
                lib/cglib-nodep-2.2.2.jar,\\r
                lib/com.springsource.org.aopalliance-1.0.0.jar,\\r
                lib/com.springsource.org.apache.commons.logging-1.1.1.jar,\\r
index 39566db2359a8e2a619a64fd0461d85458db98dd..3ba22e8f2fed500c3b2c85328659242019b5e34f 100644 (file)
@@ -3,7 +3,7 @@
   <parent>\r
     <groupId>eu.etaxonomy</groupId>\r
     <artifactId>taxeditor-parent</artifactId>\r
-    <version>3.3.0-SNAPSHOT</version>\r
+    <version>3.3.0.201401161011</version>\r
   </parent>\r
   <modelVersion>4.0.0</modelVersion>\r
   <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r
index 104450a57fc0fc41dbe08ebcac62094b40c8cc5e..32dfc131e1c93c08ed03d9476146713d53057da9 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Editor Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.editor;singleton:=true
-Bundle-Version: 3.3.0.qualifier
+Bundle-Version: 3.3.0.201401161011
 Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
 Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: plugin
index 4d7c2c07fa768e697667bed11e681ac20c0a5b85..3df339ccfaf64d366cde41804f95768c97091cd0 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
-    <version>3.3.0-SNAPSHOT</version>
+    <version>3.3.0.201401161011</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
index 6575c025ff5ca9ecce07a3d4a61b1ea71bb60ec7..c93d0082895e4405afdb1b0c29850ba4a7f5e01c 100644 (file)
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature.platform"
       label="Taxeditor Dependencies"
-      version="3.3.0.qualifier"
+      version="3.3.0.201401161011"
       os="linux,macosx,win32"
       ws="cocoa,gtk,win32"
       arch="x86,x86_64">
index 98330db8d220aa843d0cbee4a3400883c2e65775..800ee6743bfbcddd51112f1d0ee0d4ecb12c3e5a 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.3.0-SNAPSHOT</version>
+               <version>3.3.0.201401161011</version>
        </parent>
        <modelVersion>4.0.0</modelVersion>
        <artifactId>eu.etaxonomy.taxeditor.feature.platform</artifactId>
index 19c6fb8e9826f2f789e56acb95d92785178e9127..979b60aa3bb39eadcd27e7e2bd57d01a9a9da919 100644 (file)
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature"
       label="Taxonomic Editor"
-      version="3.3.0.qualifier"
+      version="3.3.0.201401161011"
       provider-name="EDIT"
       plugin="eu.etaxonomy.taxeditor.application"
       os="linux,macosx,win32"
index 4ea5c9ef9b7121526064205e2c14b7ee337febdb..2a5e55f05e6d7c1696a0f53a468d81f693bae59e 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.3.0-SNAPSHOT</version>
+               <version>3.3.0.201401161011</version>
        </parent>
        <modelVersion>4.0.0</modelVersion>
        <artifactId>eu.etaxonomy.taxeditor.feature</artifactId>
index def207374813168e6b6eaca93e5299095aacb35f..dd97c0832d682ceb97cc358dd682ec9c3dd2a3d1 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Help
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.help; singleton:=true
-Bundle-Version: 3.3.0.qualifier
+Bundle-Version: 3.3.0.201401161011
 Bundle-Activator: eu.etaxonomy.taxeditor.help.Activator
 Bundle-Vendor: EDIT
 Require-Bundle: org.eclipse.ui,
index dc625f5b98afae9000d3991c5d7b4660a2302ebe..3f8f612c0a7d16680883bfad81d6fdd4246cafbd 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.3.0-SNAPSHOT</version>
+               <version>3.3.0.201401161011</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index fbc2a192b7801d7132414d8c716df464f41d9ec0..341a8a282f4c7bdf89fcf68accbcc81661b023e5 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Navigation Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.navigation;singleton:=true
-Bundle-Version: 3.3.0.qualifier
+Bundle-Version: 3.3.0.201401161011
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,
  eu.etaxonomy.taxeditor.navigation,
index f6295f28d89e23af6c4798749218defa8bd7d6a9..ce8bbd430e606ea3871bd34d6be48e7f3a22f81a 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.3.0-SNAPSHOT</version>
+               <version>3.3.0.201401161011</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 9391b836390319a798eddaf5a70d8b591883268b..846eaf3f06cfaa69bdd3d0f5ba99bd57f51d5dc1 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Printpublisher Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.printpublisher;singleton:=true
-Bundle-Version: 3.3.0.qualifier
+Bundle-Version: 3.3.0.201401161011
 Require-Bundle: org.eclipse.osgi,
  org.eclipse.ui,
  eu.etaxonomy.taxeditor.cdmlib,
index 69ede3f58390fdadd21c4bf5dcfed103de192d99..4fcd71d78f781cc8f9a9006bb4384021586ce31b 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <artifactId>taxeditor-parent</artifactId>
                <groupId>eu.etaxonomy</groupId>
-               <version>3.3.0-SNAPSHOT</version>
+               <version>3.3.0.201401161011</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 9a8373a7da0404fab7389b4eead0f8b73a519ef7..2061c1cfb09ed8f17ca028f4f37620994736085c 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: DataStore Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.store;singleton:=true
-Bundle-Version: 3.3.0.qualifier
+Bundle-Version: 3.3.0.201401161011
 Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,
index c2a3af24f9a42750e6a958e2cc28b3adbd83c265..520341ebafb8dbb3211e6f8be68f620c47694a0c 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
-       <version>3.3.0-SNAPSHOT</version>
+       <version>3.3.0.201401161011</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
index 5e4f5a051c8980ec055d2d291b7575394b28b46f..f3f9155f04f4a658414351118b14777e19a0cbf1 100644 (file)
@@ -18,9 +18,9 @@ import org.eclipse.swt.SWT;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
-import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.CheckboxElement;
+import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractIdentifiableEntityDetailElement;
 import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
@@ -92,14 +92,15 @@ public class TaxonBaseDetailElement extends AbstractIdentifiableEntityDetailElem
                                        "Taxon is excluded", ((Taxon) entity).isExcluded(), style);
                        checkbox_unplaced = formFactory.createCheckbox(formElement,
                                        "Taxon is unplaced", ((Taxon) entity).isUnplaced(), style);
-                       checkbox_published = formFactory.createCheckbox(formElement,
-                               "Taxon is published", ((Taxon) entity).isPublish(), style);
                }
 
                checkbox_doubtful = formFactory.createCheckbox(formElement,
                                entity.getClass().getSimpleName() + " is doubtful", entity.isDoubtful(), style);
-
-
+               
+               if (entity instanceof Taxon) {
+                       checkbox_published = formFactory.createCheckbox(formElement,
+                                       "Taxon is published", ((Taxon) entity).isPublish(), style);
+               }
        }
 
        /** {@inheritDoc} */
@@ -136,7 +137,7 @@ public class TaxonBaseDetailElement extends AbstractIdentifiableEntityDetailElem
                } else if (eventSource == checkbox_unplaced) {
                    ((Taxon) getEntity()).setUnplaced(checkbox_unplaced.getSelection());
                } else if (eventSource == checkbox_published) {
-                   ((Taxon) getEntity()).setPublish(checkbox_published.getSelection());
+                   ((Taxon)getEntity()).setPublish(checkbox_published.getSelection());
                }
        }
 }
index db4c250dc3ce0067c6fb6091ff9d1454ee7d9617..154dc12b923f49b450759a692ee94939534b5550 100644 (file)
@@ -1,9 +1,9 @@
 // $Id$
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* 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.
 */
@@ -16,6 +16,7 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.handlers.HandlerUtil;
 import org.eclipse.ui.progress.IProgressConstants;
@@ -35,7 +36,7 @@ import eu.etaxonomy.taxeditor.view.datasource.CdmMetaDataAwareDataSourceContaine
  * @version 1.0
  */
 public class UpdateDataSourceHandler extends AbstractDataSourceHandler {
-       
+
        /* (non-Javadoc)
         * @see eu.etaxonomy.taxeditor.datasource.handler.AbstractDataSourceHandler#specificExecute(org.eclipse.core.commands.ExecutionEvent)
         */
@@ -43,9 +44,11 @@ public class UpdateDataSourceHandler extends AbstractDataSourceHandler {
        @Override
        public boolean specificExecute(ExecutionEvent event) {
                final CdmMetaDataAwareDataSourceContainer container = getSelectedDataSourceContainer(event);
-               
+
                final Display display = Display.getCurrent();
-               if(! MessageDialog.openConfirm(HandlerUtil.getActiveShell(event), "Confirm Deletion", "Are you sure you want to update the datasource?")){
+               if(! MessageDialog.open(MessageDialog.CONFIRM, HandlerUtil.getActiveShell(event), "Update Datasource", "WARNING!\n\n" +
+                               "This will change your data base structure! Be sure you have an up-to-date backup of your data before running the update! \n\n " +
+                               "Are you sure you want to update the datasource?", SWT.NONE)){
                        return false;
                }
                Job job = new Job("Updating datasource " + container.getDataSource().getName()){
@@ -54,19 +57,19 @@ public class UpdateDataSourceHandler extends AbstractDataSourceHandler {
                        protected IStatus run(IProgressMonitor monitor) {
                                CdmUpdater updater = new CdmUpdater();
                                IStatus status = null;
-                               
+
                                try{
                                        if(updater.updateToCurrentVersion(container.getDataSource(), CdmProgressMonitorAdapter.CreateMonitor(monitor))){
                                                display.asyncExec(new Runnable(){
 
                                                        @Override
                                                        public void run() {
-                                                               
+
                                                                CdmDataSourceViewPart view = (CdmDataSourceViewPart) StoreUtil.getView(CdmDataSourceViewPart.ID, false);
                                                                if(view != null){
                                                                        view.getViewer().update(new CdmMetaDataAwareDataSourceContainer[]{container}, null);
                                                                }
-                                                               
+
                                                        }
                                                });
                                                status = Status.OK_STATUS;
@@ -75,17 +78,17 @@ public class UpdateDataSourceHandler extends AbstractDataSourceHandler {
                                        status = new Status(IStatus.ERROR, TaxeditorStorePlugin.PLUGIN_ID, e.getMessage(), e);
                                        StoreUtil.errorDialog("Could not run updater", getClass(), status);
                                }
-                               
-                               
+
+
                                return status;
                        }
-                       
+
                };
-               
+
                job.setPriority(Job.BUILD);
                job.setProperty(IProgressConstants.KEEP_PROPERTY, true);
                job.schedule();
-               
+
                return false;
        }
 }
index 404e65ebe994b484abffa59d757563ba7f87fc85..284261bad731e63a040db21aa5eaadbc00d664aa 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?><product application="eu.etaxonomy.taxeditor.application.application" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" includeLaunchers="true" name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product" useFeatures="true" version="3.3.0.SNAPSHOT">
+<?pde version="3.5"?><product application="eu.etaxonomy.taxeditor.application.application" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" includeLaunchers="true" name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product" useFeatures="true" version="3.3.0">
   <aboutInfo>
     <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
     <text>
index d5e48ecc33f75653aadf65886689a8a4b5aaa0f3..1f8674852031784e61f3a41bc0522acdb18b8d22 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.3.0-SNAPSHOT</version>
+               <version>3.3.0.201401161011</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 016cdf3966f03708525a5d5a3dfd2396ce818189..24da0d76fbf0d56fd421e195cf440828f5ee3d35 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   </prerequisites>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>taxeditor-parent</artifactId>
-  <version>3.3.0-SNAPSHOT</version>
+  <version>3.3.0.201401161011</version>
   <name>EDIT Taxonomic Editor</name>
   <description>The Taxonomic Editor for EDIT's platform for cybertaxonomy</description>
   <url>http://wp5.e-taxonomy.eu</url>
   <properties>
     <java.codelevel>1.6</java.codelevel>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <cdmlib.version>3.3.0-SNAPSHOT</cdmlib.version>
+    <cdmlib.version>3.3.0</cdmlib.version>
     <!-- TODO can we use project.version ????? -->
     <tycho.version>0.14.0</tycho.version>
-    <taxeditor.version>3.3.0-SNAPSHOT</taxeditor.version>
+    <taxeditor.version>3.3.0</taxeditor.version>
   </properties>
   <modules>
     <module>eu.etaxonomy.taxeditor.cdmlib</module>