merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Mon, 8 Jun 2015 11:57:53 +0000 (11:57 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Mon, 8 Jun 2015 11:57:53 +0000 (11:57 +0000)
1  2 
.gitattributes
.gitignore
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.editor/plugin.xml
eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF

diff --cc .gitattributes
Simple merge
diff --cc .gitignore
index 5c8b928b8e9810e6ba3615b0efdeead665c5c54d,5c8b928b8e9810e6ba3615b0efdeead665c5c54d..074683469e08c4a0d5b4632b9a11b4499d953467
@@@ -5,14 -5,14 +5,43 @@@ eu.etaxonomy.taxeditor.bulkeditor/.sett
  eu.etaxonomy.taxeditor.bulkeditor/target
  eu.etaxonomy.taxeditor.cdmlib/.directory
  eu.etaxonomy.taxeditor.cdmlib/.settings
++eu.etaxonomy.taxeditor.cdmlib/META-INF/bin
++eu.etaxonomy.taxeditor.cdmlib/bin
  eu.etaxonomy.taxeditor.cdmlib/cdmlib-*.jar
  eu.etaxonomy.taxeditor.cdmlib/cdmlib-*.zip
  eu.etaxonomy.taxeditor.cdmlib/dist
++eu.etaxonomy.taxeditor.cdmlib/lib/bin
  eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib*
  eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.servletbridge.extensionbundle-1.2.0.v20100503.jar
  eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.transforms.hook-1.0.300.v20100719.jar
  eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.weaving.hook-1.0.100.v20110502.jar
  eu.etaxonomy.taxeditor.cdmlib/log4j-1.2.14src.zip
++eu.etaxonomy.taxeditor.cdmlib/src/bin
++eu.etaxonomy.taxeditor.cdmlib/src/main/bin
++eu.etaxonomy.taxeditor.cdmlib/src/main/java/bin
++eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/bin
++eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/bin
++eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/bin
++eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/bin
++eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/bin
++eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/lazyloading/bin
++eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/bin
++eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/remote/bin
++eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/bin
++eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/bin
++eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/collection/bin
++eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/collection/internal/bin
++eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/proxy/bin
++eu.etaxonomy.taxeditor.cdmlib/src/main/resources/bin
++eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/bin
++eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/bin
++eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/bin
++eu.etaxonomy.taxeditor.cdmlib/src/test/bin
++eu.etaxonomy.taxeditor.cdmlib/src/test/resources/bin
++eu.etaxonomy.taxeditor.cdmlib/src/test/resources/eu/bin
++eu.etaxonomy.taxeditor.cdmlib/src/test/resources/eu/etaxonomy/bin
++eu.etaxonomy.taxeditor.cdmlib/src/test/resources/eu/etaxonomy/cdm/bin
++eu.etaxonomy.taxeditor.cdmlib/src/test/resources/eu/etaxonomy/cdm/datasources/bin
  eu.etaxonomy.taxeditor.cdmlib/target
  eu.etaxonomy.taxeditor.editor/.settings
  eu.etaxonomy.taxeditor.editor/target
index 9c171a2137d2e1a25755a48885d8bf1b87fc6a66,d06b782aa811d6b29e2875ed6f37b4a6d63f1d12..ed687ff8531d18b08f56b8ad3e58cc0ccf77fd65
              class="eu.etaxonomy.taxeditor.bulkeditor.command.BulkEditorPropertyTester"
              id="taxeditor-bulkeditor.PropertyTester"
              namespace="taxeditor-bulkeditor.propertyTester"
-             properties="isGroup"
+             properties="isGroupEditor"
              type="eu.etaxonomy.taxeditor.bulkeditor.BulkEditor">
        </propertyTester>
 +      <propertyTester
 +            class="eu.etaxonomy.taxeditor.editor.handler.SpecimenPropertyTester"
 +            id="eu.etaxonomy.taxeditor.editor.handler.SpecimenPropertyTester"
 +            namespace="eu.etaxonomy.taxeditor.editor.handler.SpecimenPropertyTester"
 +            properties="isSequence,isSingleRead"
 +            type="org.eclipse.jface.viewers.IStructuredSelection">
 +      </propertyTester>
     </extension>
     <extension
           point="org.eclipse.ui.bindings">   
index d52b5b19652facf363dc8d581834fb310a3ac39e,dd55c822551cf19c70da92cb4b1f3e0c86ff48c9..4d33cf2f602b5d8a87980dbe33796788f829cb37
@@@ -7,19 -7,18 +7,19 @@@ Bundle-ActivationPolicy: laz
  Bundle-Vendor: EDIT
  Bundle-RequiredExecutionEnvironment: JavaSE-1.6
  Require-Bundle: org.apache.log4j,
-  org.eclipse.ui;bundle-version="3.6.2",
-  org.eclipse.core.runtime;bundle-version="3.6.0",
+  org.eclipse.ui,
+  org.eclipse.core.runtime,
 - org.eclipse.swtbot.eclipse.core,
 + org.eclipse.swtbot.eclipse.core;bundle-version="2.0.5",
   org.eclipse.swtbot.eclipse.finder,
   org.eclipse.swtbot.junit4_x,
   org.eclipse.ui.ide,
-  org.junit4,
-  eu.etaxonomy.taxeditor.application;bundle-version="3.0.6",
-  eu.etaxonomy.taxeditor.bulkeditor;bundle-version="3.0.6",
-  eu.etaxonomy.taxeditor.cdmlib;bundle-version="3.0.6",
-  eu.etaxonomy.taxeditor.editor;bundle-version="3.0.6",
-  eu.etaxonomy.taxeditor.help;bundle-version="3.0.6",
-  eu.etaxonomy.taxeditor.navigation;bundle-version="3.0.6",
-  eu.etaxonomy.taxeditor.printpublisher;bundle-version="3.0.6",
-  eu.etaxonomy.taxeditor.store;bundle-version="3.0.6"
+  eu.etaxonomy.taxeditor.application,
+  eu.etaxonomy.taxeditor.bulkeditor,
+  eu.etaxonomy.taxeditor.cdmlib,
+  eu.etaxonomy.taxeditor.editor,
+  eu.etaxonomy.taxeditor.help,
+  eu.etaxonomy.taxeditor.navigation,
+  eu.etaxonomy.taxeditor.printpublisher,
+  eu.etaxonomy.taxeditor.store
  Eclipse-RegisterBuddy: org.apache.log4j
++Import-Package: org.junit.runner