Google Git
Sign in
eclipse/gerrit/stem/org.eclipse.stem.data.earthscience/e1155cf771ca659e9978f67d49aebe424cb50105^!/.
commit
e1155cf771ca659e9978f67d49aebe424cb50105
[log] [tgz]
author
James Kaufman <jhkauf@us.ibm.com>
Wed Nov 14 18:09:15 2012 +0000
committer
James Kaufman <jhkauf@us.ibm.com>
Wed Nov 14 18:09:15 2012 +0000
tree
b6770e406d98cdea517d55af745843ee6bab590e
parent
411a669371282d38488a6fbd724970fb55b5d840 [diff]
updated manifest based on refactor of data

git-svn-id: http://dev.eclipse.org/svnroot/technology/org.eclipse.stem/trunk/data/earthscience@3592 92a21009-5b66-0410-b83a-dc787c41c6e9

diff --git a/org.eclipse.stem.internal.data.geography.earthscience/META-INF/MANIFEST.MF b/org.eclipse.stem.internal.data.geography.earthscience/META-INF/MANIFEST.MF
index 75705c8..46721bd 100644
--- a/org.eclipse.stem.internal.data.geography.earthscience/META-INF/MANIFEST.MF
+++ b/org.eclipse.stem.internal.data.geography.earthscience/META-INF/MANIFEST.MF

@@ -5,6 +5,7 @@
 Bundle-Version: 2.0.0
 Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
 Require-Bundle: org.eclipse.stem.definitions,
+ org.eclipse.stem.geography,
  org.eclipse.stem.data.geography,
  org.eclipse.stem.internal.data,
  org.eclipse.stem.internal.data.geography,

diff --git a/org.eclipse.stem.internal.data.geography.earthscience/src/org/eclipse/stem/internal/data/geography/earthscience/models/EarthScienceModelGenerator.java b/org.eclipse.stem.internal.data.geography.earthscience/src/org/eclipse/stem/internal/data/geography/earthscience/models/EarthScienceModelGenerator.java
index 02e2370..7f58055 100755
--- a/org.eclipse.stem.internal.data.geography.earthscience/src/org/eclipse/stem/internal/data/geography/earthscience/models/EarthScienceModelGenerator.java
+++ b/org.eclipse.stem.internal.data.geography.earthscience/src/org/eclipse/stem/internal/data/geography/earthscience/models/EarthScienceModelGenerator.java

@@ -22,7 +22,7 @@
 
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.stem.core.Constants;
-import org.eclipse.stem.data.geography.ISOKey;
+import org.eclipse.stem.geography.names.ISOKey;
 import org.eclipse.stem.internal.data.ModelGenerator;
 import org.eclipse.stem.internal.data.PluginFileGenerator;
 import org.eclipse.stem.internal.data.generatedplugin.DublinCore;

diff --git a/org.eclipse.stem.internal.data.geography.earthscience/src/org/eclipse/stem/internal/data/geography/earthscience/models/EarthScienceModelSpecification.java b/org.eclipse.stem.internal.data.geography.earthscience/src/org/eclipse/stem/internal/data/geography/earthscience/models/EarthScienceModelSpecification.java
index c95b9bd..72e453a 100755
--- a/org.eclipse.stem.internal.data.geography.earthscience/src/org/eclipse/stem/internal/data/geography/earthscience/models/EarthScienceModelSpecification.java
+++ b/org.eclipse.stem.internal.data.geography.earthscience/src/org/eclipse/stem/internal/data/geography/earthscience/models/EarthScienceModelSpecification.java

@@ -22,8 +22,8 @@
 import org.eclipse.stem.core.graph.Graph;
 import org.eclipse.stem.core.model.Model;
 import org.eclipse.stem.core.model.ModelPackage;
-import org.eclipse.stem.data.geography.ISOKey;
 import org.eclipse.stem.definitions.labels.LabelsPackage;
+import org.eclipse.stem.geography.names.ISOKey;
 import org.eclipse.stem.internal.data.generatedplugin.DublinCore;
 import org.eclipse.stem.internal.data.geography.specifications.AdminLevelSet;
 import org.eclipse.stem.internal.data.geography.specifications.CountryGraphPropertyFileSpecification;

diff --git a/org.eclipse.stem.internal.data.geography.earthscience/src/org/eclipse/stem/internal/data/geography/propertydata/EarthSciencePropertyData.java b/org.eclipse.stem.internal.data.geography.earthscience/src/org/eclipse/stem/internal/data/geography/propertydata/EarthSciencePropertyData.java
index 1db6f9d..82b94b8 100644
--- a/org.eclipse.stem.internal.data.geography.earthscience/src/org/eclipse/stem/internal/data/geography/propertydata/EarthSciencePropertyData.java
+++ b/org.eclipse.stem.internal.data.geography.earthscience/src/org/eclipse/stem/internal/data/geography/propertydata/EarthSciencePropertyData.java

@@ -12,7 +12,8 @@
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 
-import org.eclipse.stem.data.geography.ISOKey;
+import org.eclipse.stem.definitions.nodes.GeographicFeature;
+import org.eclipse.stem.geography.names.ISOKey;
 
 /**
  * This class contains the data from a property that specifies earth science data in

diff --git a/org.eclipse.stem.internal.data.geography.earthscience/src/org/eclipse/stem/internal/data/geography/specifications/EarthPropertyFileSpecification.java b/org.eclipse.stem.internal.data.geography.earthscience/src/org/eclipse/stem/internal/data/geography/specifications/EarthPropertyFileSpecification.java
index 7df921c..345dffb 100644
--- a/org.eclipse.stem.internal.data.geography.earthscience/src/org/eclipse/stem/internal/data/geography/specifications/EarthPropertyFileSpecification.java
+++ b/org.eclipse.stem.internal.data.geography.earthscience/src/org/eclipse/stem/internal/data/geography/specifications/EarthPropertyFileSpecification.java

@@ -15,13 +15,14 @@
 import java.util.Date;
 import java.util.StringTokenizer;
 
+import org.eclipse.stem.core.graph.Graph;
 import org.eclipse.stem.core.graph.NodeLabel;
-import org.eclipse.stem.data.geography.ISOKey;
 import org.eclipse.stem.definitions.labels.EarthScienceLabel;
 import org.eclipse.stem.definitions.labels.EarthScienceLabelValue;
 import org.eclipse.stem.definitions.labels.LabelsFactory;
 import org.eclipse.stem.definitions.labels.impl.EarthScienceLabelImpl;
 import org.eclipse.stem.definitions.nodes.impl.RegionImpl;
+import org.eclipse.stem.geography.names.ISOKey;
 import org.eclipse.stem.internal.data.geography.propertydata.EarthSciencePropertyData;
 import org.eclipse.stem.internal.data.propertydata.PropertyData;