Project

General

Profile

« Previous | Next » 

Revision 39e32c59

Added by Lutz Suhrbier over 12 years ago

  • ID 39e32c59ceaf3c683fb0c2483f92d812804d5599
  • Parent b363e59c

First changes for Spring Remote

View differences:

eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
106 106 
 lib/spring-security-config-3.0.5.RELEASE.jar,
107 107 
 lib/dozer-5.3.0.jar,
108 108 
 lib/google-api-translate-java-0.92.jar,
109 
 lib/cdmlib-services-3.0.5-SNAPSHOT.jar,
110 
 lib/cdmlib-commons-3.0.6-SNAPSHOT.jar,
111 
 lib/cdmlib-ext-3.0.6-SNAPSHOT.jar,
112 
 lib/cdmlib-io-3.0.6-SNAPSHOT.jar,
113 
 lib/cdmlib-model-3.0.6-SNAPSHOT.jar,
114 
 lib/cdmlib-persistence-3.0.6-SNAPSHOT.jar,
115 
 lib/cdmlib-print-3.0.6-SNAPSHOT.jar,
116 
 lib/cdmlib-remote-3.0.6-SNAPSHOT.jar,
117 
 lib/cdmlib-services-3.0.6-SNAPSHOT.jar
109 
 lib/cdmlib-commons-3.0.7-SNAPSHOT.jar,
110 
 lib/cdmlib-ext-3.0.7-SNAPSHOT.jar,
111 
 lib/cdmlib-io-3.0.7-SNAPSHOT.jar,
112 
 lib/cdmlib-model-3.0.7-SNAPSHOT.jar,
113 
 lib/cdmlib-persistence-3.0.7-SNAPSHOT.jar,
114 
 lib/cdmlib-print-3.0.7-SNAPSHOT.jar,
115 
 lib/cdmlib-remote-3.0.7-SNAPSHOT.jar,
116 
 lib/cdmlib-services-3.0.7-SNAPSHOT.jar
118 117 
Export-Package: com.google.api,
119 118 
 com.google.api.detect,
120 119 
 com.google.api.translate,
eu.etaxonomy.taxeditor.cdmlib/build.properties
2 2 
               lib/,\
3 3 
               lib/mysql-connector-java-5.0.5.jar,\
4 4 
               lib/junit-4.8.1.jar,\
5 
               lib/cdmlib-commons-3.0.6-SNAPSHOT.jar,\
6 
               lib/cdmlib-ext-3.0.6-SNAPSHOT.jar,\
7 
               lib/cdmlib-io-3.0.6-SNAPSHOT.jar,\
8 
               lib/cdmlib-model-3.0.6-SNAPSHOT.jar,\
9 
               lib/cdmlib-persistence-3.0.6-SNAPSHOT.jar,\
10 
               lib/cdmlib-print-3.0.6-SNAPSHOT.jar,\
11 
               lib/cdmlib-remote-3.0.6-SNAPSHOT.jar,\
12 
               lib/cdmlib-services-3.0.6-SNAPSHOT.jar,\
13 5 
               lib/spring-security-config-3.0.5.RELEASE.jar,\
14 
               lib/spring-security-core-3.0.5.RELEASE.jar
6 
               lib/spring-security-core-3.0.5.RELEASE.jar,\
7 
               lib/cdmlib-commons-3.0.7-SNAPSHOT.jar,\
8 
               lib/cdmlib-ext-3.0.7-SNAPSHOT.jar,\
9 
               lib/cdmlib-io-3.0.7-SNAPSHOT.jar,\
10 
               lib/cdmlib-model-3.0.7-SNAPSHOT.jar,\
11 
               lib/cdmlib-persistence-3.0.7-SNAPSHOT.jar,\
12 
               lib/cdmlib-print-3.0.7-SNAPSHOT.jar,\
13 
               lib/cdmlib-remote-3.0.7-SNAPSHOT.jar,\
14 
               lib/cdmlib-services-3.0.7-SNAPSHOT.jar
15 15 
jars.compile.order = cdmLibrary.jar
16 16 
src.includes = lib/
17 17 
jre.compilation.profile = J2SE-1.6
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java
142 142 
			return EndnoteImportConfigurator.NewInstance(null, null);
143 143 
		case Excel_Taxa:
144 144 
			return NormalExplicitImportConfigurator.NewInstance(null, null,
145 
					null);
145 
					null, null);
146 146 
		case Abcd:
147 147 
			return Abcd206ImportConfigurator.NewInstance(null, null);
148 148 
		case Sdd:
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureDistributionDetailElement.java
13 13 
import java.net.URI;
14 14 
import java.net.URISyntaxException;
15 15 
import java.util.Arrays;
16 
import java.util.HashSet;
17 16 
import java.util.List;
18 17 
import java.util.Map;
19 
import java.util.Set;
20 18 

  		




  21
  19
  
    
import org.eclipse.swt.SWT;


  		




  22
  20
  
    
import org.eclipse.swt.widgets.Label;


  		




  23
  21
  
    

  		




  24
  22
  
    
import eu.etaxonomy.cdm.common.UriUtils;


  		




  25
  
  
    
import eu.etaxonomy.cdm.ext.geo.EditGeoServiceUtilities;


  		




  26
  23
  
    
import eu.etaxonomy.cdm.model.common.Language;


  		




  27
  
  
    
import eu.etaxonomy.cdm.model.description.DescriptionElementBase;


  		




  28
  
  
    
import eu.etaxonomy.cdm.model.description.Distribution;


  		




  29
  24
  
    
import eu.etaxonomy.cdm.model.description.PresenceAbsenceTermBase;


  		




  
  25
  
    
import eu.etaxonomy.cdm.model.description.TaxonDescription;


  		




  30
  26
  
    
import eu.etaxonomy.taxeditor.model.FeatureNodeContainer;


  		




  31
  27
  
    
import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;


  		




  32
  28
  
    
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;


  		




  ......




  115
  111
  
    

  		




  116
  112
  
    
		List<Language> languages = Arrays.asList(new Language[]{CdmStore.getDefaultLanguage()});


  		




  117
  113
  
    
		


  		




  118
  
  
    
		String parameter = EditGeoServiceUtilities.getDistributionServiceRequestParameterString(getDistributions(), presenceAbsenceTermColors, width, 0, bbox, backLayer, null, languages);


  		




  
  114
  
    
		String parameter = CdmStore.getGeoService().getDistributionServiceRequestParameterString(getTaxonDescriptions(), presenceAbsenceTermColors, width, 0, bbox, backLayer, languages);


  		




  119
  115
  
    
		


  		




  120
  
  
    
		


  		




  121
  
  
    
		String mapUriString = accessPoint + "?" + parameter + "&ms=1000";


  		




  
  116
  
    
		String mapUriString = String.format("%s?%s&ms=1000", accessPoint, parameter);


  		




  122
  117
  
    
		return mapUriString;


  		




  123
  118
  
    
	}


  		




  124
  119
  
    
	


  		




  125
  120
  
    
	/**


  		




  126
  121
  
    
	 * @return


  		




  127
  122
  
    
	 */


  		




  128
  
  
    
	private Set<Distribution> getDistributions() {


  		




  129
  
  
    
		HashSet<Distribution> distributions = new HashSet<Distribution>();


  		




  130
  
  
    
		


  		




  131
  
  
    
		for (DescriptionElementBase element : getEntity().getDescriptionElements()) {


  		




  132
  
  
    
			if (element instanceof Distribution) {


  		




  133
  
  
    
				distributions.add((Distribution) element);


  		




  134
  
  
    
			}


  		




  135
  
  
    
		}


  		




  136
  
  
    
		return distributions;


  		




  
  123
  
    
	private List<TaxonDescription> getTaxonDescriptions() {


  		




  
  124
  
    
		return Arrays.asList(((TaxonDescription) getEntity().getDescription()).getTaxon().getDescriptions().toArray(new TaxonDescription[0]));


  		




  137
  125
  
    
	}


  		




  138
  126
  
    

  		




  139
  127
  
    
}


  		












  

    
      eu.etaxonomy.taxeditor.store/src/main/resources/eu/etaxonomy/cdm/editorApplicationContext.xml
    
  





  7
  7
  
    
    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd


  		




  8
  8
  
    
    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">


  		




  9
  9
  
    

  		




  10
  
  
    
  <import resource="classpath:/eu/etaxonomy/cdm/defaultApplicationContext.xml"/>


  		




  11
  
  
    
  <!-- <import resource="classpath:/eu/etaxonomy/cdm/remotingApplicationContext.xml"/> -->


  		




  
  10
  
    
  <!-- import resource="classpath:/eu/etaxonomy/cdm/defaultApplicationContext.xml"/-->


  		




  
  11
  
    
  <import resource="classpath:/eu/etaxonomy/cdm/remotingApplicationContext.xml"/>


  		




  12
  12
  
    
  <bean id="persistentTermInitializer" class="eu.etaxonomy.cdm.database.PersistentTermInitializer">


  		




  13
  13
  
    
    <property name="omit" value="false" />


  		




  14
  14
  
    
  </bean>


  		












  

    
      pom.xml
    
  





  11
  11
  
    
	<packaging>pom</packaging>


  		




  12
  12
  
    
	<properties>


  		




  13
  13
  
    
		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>


  		




  14
  
  
    
		<cdmlib.version>3.0.6-SNAPSHOT</cdmlib.version>


  		




  
  14
  
    
		<cdmlib.version>3.0.7-SNAPSHOT</cdmlib.version>


  		




  15
  15
  
    
	</properties>


  		




  16
  16
  
    
	<modules>


  		




  17
  17
  
    
		<module>eu.etaxonomy.taxeditor.cdmlib</module>


  		












Also available in:  Unified diff