On Wednesday, August 24, 2011 05:55:02 PM andrea antonello wrote:
> > Hello Andrea, today, I have fixed jgrass (minor fixes), in order to
> > compile it using udig sdk-1.2.2. I have run udig-jgrass and I have
> > loaded some netcdf files (nc).
> > It looks right!
>
> Amazing, great! Guess you made the imageio-ext part right.
mmm... It looks like I have had a lot of luck :D
I have only linked the jgrass plugins with the new udig sdk (eclipse indigo),
solve some problems in the MANIFEST, finally I have replased the following line
rasterMaps =
CatalogUIPlugin.getDefault().getImages().getImageDescriptor(
by
rasterMaps = CatalogUIPlugin.getDefault().getImageDescriptor(
I have attached the entery patch in this mail.
The udig sdk include image-ext-netcdf-core1.1.0.jar.
Yesterday, I have done a "light" test. I loaded some netcdf files, then uDig
showed the layers, but actually I didn't check their details.
>
> > As you recomended me, I download the source from gitorious. What do you
> > think about to upload jgrass to github?
> >
> > by example https://github.com/uDig-Community/udig-community
> >
> > or other branch? so, I could fork it and request merge you (like udig
> > process)
> >
> > Have you any reazon to maintain jgrass in gitorious?
> >
> > comments?
>
> Alright, the fact is that JGrass doesn't exist any more as such. It
> has been split into te few plugins that are now in udig + the Spatial
> toolbox with JGrasstools. So the gitorious repository is there only
> for archive reasons.
>
> The last two plugins I wanted to bring into uDig were the netcdf
> related ones. It looks that you did so already (thanks!).
As I comment, I have link with the udig-sdk, but It should work with udig-
platform.
> So, since
> the PSC already voted to bring those in uDig, we just need to insert
> the plugins into the current uDig repo.
> I would just change the namespace to eu.udig and we should be good.
>
> What do you think?
Of course you will have my +1
>
> Andrea
>
well, I will be reading the jgrass code and thinking in the udig weather
desktop layout.
> > --
> > Mauricio Pazos
>
> _______________________________________________
> User-friendly Desktop Internet GIS (uDig)
> http://udig.refractions.net
> http://lists.refractions.net/mailman/listinfo/udig-devel
--
Mauricio Pazos
diff --git a/dbplugins/eu.hydrologis.jgrass.extlibs/META-INF/MANIFEST.MF b/dbplugins/eu.hydrologis.jgrass.extlibs/META-INF/MANIFEST.MF
index 811b17f..9538d6f 100644
--- a/dbplugins/eu.hydrologis.jgrass.extlibs/META-INF/MANIFEST.MF
+++ b/dbplugins/eu.hydrologis.jgrass.extlibs/META-INF/MANIFEST.MF
@@ -327,6 +327,8 @@ Export-Package: Jama,
org.jgrasstools.gears.io.converters,
org.jgrasstools.gears.io.dbf,
org.jgrasstools.gears.io.dxfdwg,
+ org.jgrasstools.gears.io.dxfdwg.libs,
+ org.jgrasstools.gears.io.dxfdwg.libs.dxf,
org.jgrasstools.gears.io.eicalculator,
org.jgrasstools.gears.io.exif,
org.jgrasstools.gears.io.grass,
diff --git a/plugins/eu.hydrologis.jgrass.libs/.classpath b/plugins/eu.hydrologis.jgrass.libs/.classpath
index 3e93616..1fa3e68 100644
--- a/plugins/eu.hydrologis.jgrass.libs/.classpath
+++ b/plugins/eu.hydrologis.jgrass.libs/.classpath
@@ -3,6 +3,5 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
- <classpathentry combineaccessrules="false" kind="src" path="/net.refractions.udig.libs"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/eu.hydrologis.jgrass.netcdf/.classpath b/plugins/eu.hydrologis.jgrass.netcdf/.classpath
index 79d330d..9bf6b04 100644
--- a/plugins/eu.hydrologis.jgrass.netcdf/.classpath
+++ b/plugins/eu.hydrologis.jgrass.netcdf/.classpath
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry exported="true" kind="lib" path="libs/gt-coverage-api-2.7-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib" path="libs/gt-coverage-core-2.7-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib" path="libs/gt-netcdf-2.7-SNAPSHOT.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
+ <classpathentry exported="true" kind="lib" path="libs/gt-coverage-api-2.7-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib" path="libs/gt-coverage-core-2.7-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib" path="libs/gt-netcdf-2.7-SNAPSHOT.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/eu.hydrologis.jgrass.netcdf/.settings/org.eclipse.jdt.core.prefs b/plugins/eu.hydrologis.jgrass.netcdf/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7d07e1c..0000000
--- a/plugins/eu.hydrologis.jgrass.netcdf/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Sun May 31 08:05:50 CEST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/eu.hydrologis.jgrass.netcdf/src/eu/hydrologis/jgrass/netcdf/service/NetcdfService.java b/plugins/eu.hydrologis.jgrass.netcdf/src/eu/hydrologis/jgrass/netcdf/service/NetcdfService.java
index f099a93..354d89b 100644
--- a/plugins/eu.hydrologis.jgrass.netcdf/src/eu/hydrologis/jgrass/netcdf/service/NetcdfService.java
+++ b/plugins/eu.hydrologis.jgrass.netcdf/src/eu/hydrologis/jgrass/netcdf/service/NetcdfService.java
@@ -253,7 +253,7 @@ public class NetcdfService extends IService {
public Icon getIcon() {
// ImageDescriptor imgD = AbstractUIPlugin.imageDescriptorFromPlugin(
// JGrassPlugin.PLUGIN_ID, "icons/obj16/jgrassloc_obj.gif"); //$NON-NLS-1$
- ImageDescriptor imgD = CatalogUIPlugin.getDefault().getImages().getImageDescriptor(ISharedImages.DATASTORE_OBJ);
+ ImageDescriptor imgD = CatalogUIPlugin.getDefault().getImageDescriptor(ISharedImages.DATASTORE_OBJ);
return AWTSWTImageUtils.imageDescriptor2awtIcon(imgD);
}
diff --git a/plugins/eu.hydrologis.jgrass.openmi/.classpath b/plugins/eu.hydrologis.jgrass.openmi/.classpath
index cfde398..c80a944 100644
--- a/plugins/eu.hydrologis.jgrass.openmi/.classpath
+++ b/plugins/eu.hydrologis.jgrass.openmi/.classpath
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry exported="true" kind="lib" path="libs/org.openmi.standard.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
+ <classpathentry exported="true" kind="lib" path="libs/org.openmi.standard.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/eu.hydrologis.jgrass.ui.utilities/src/eu/hydrologis/jgrass/ui/utilities/FeatureCatalogTreeViewer.java b/plugins/eu.hydrologis.jgrass.ui.utilities/src/eu/hydrologis/jgrass/ui/utilities/FeatureCatalogTreeViewer.java
index 66306a3..a27bd41 100644
--- a/plugins/eu.hydrologis.jgrass.ui.utilities/src/eu/hydrologis/jgrass/ui/utilities/FeatureCatalogTreeViewer.java
+++ b/plugins/eu.hydrologis.jgrass.ui.utilities/src/eu/hydrologis/jgrass/ui/utilities/FeatureCatalogTreeViewer.java
@@ -238,7 +238,7 @@ public class FeatureCatalogTreeViewer extends Composite
listeners = new ArrayList<ILabelProviderListener>();
// Create the images
- vectorMaps = CatalogUIPlugin.getDefault().getImages().getImageDescriptor(
+ vectorMaps = CatalogUIPlugin.getDefault().getImageDescriptor(
ISharedImages.FEATURE_OBJ).createImage();
}
diff --git a/plugins/eu.hydrologis.jgrass.ui.utilities/src/eu/hydrologis/jgrass/ui/utilities/FeatureLayerTreeViewer.java b/plugins/eu.hydrologis.jgrass.ui.utilities/src/eu/hydrologis/jgrass/ui/utilities/FeatureLayerTreeViewer.java
index 2a58a30..8ea189c 100644
--- a/plugins/eu.hydrologis.jgrass.ui.utilities/src/eu/hydrologis/jgrass/ui/utilities/FeatureLayerTreeViewer.java
+++ b/plugins/eu.hydrologis.jgrass.ui.utilities/src/eu/hydrologis/jgrass/ui/utilities/FeatureLayerTreeViewer.java
@@ -246,9 +246,11 @@ public class FeatureLayerTreeViewer extends Composite
listeners = new ArrayList<ILabelProviderListener>();
// Create the images
- vectorMaps = CatalogUIPlugin.getDefault().getImages().getImageDescriptor(
+// mainMaps = CatalogUIPlugin.getDefault().getImages().getImageDescriptor(
+// ISharedImages.CATALOG_OBJ).createImage();
+ vectorMaps = CatalogUIPlugin.getDefault().getImageDescriptor(
ISharedImages.FEATURE_OBJ).createImage();
- mainMaps = CatalogUIPlugin.getDefault().getImages().getImageDescriptor(
+ mainMaps = CatalogUIPlugin.getDefault().getImageDescriptor(
ISharedImages.CATALOG_OBJ).createImage();
}
diff --git a/plugins/eu.hydrologis.jgrass.ui.utilities/src/eu/hydrologis/jgrass/ui/utilities/JGRasterCatalogTreeViewer.java b/plugins/eu.hydrologis.jgrass.ui.utilities/src/eu/hydrologis/jgrass/ui/utilities/JGRasterCatalogTreeViewer.java
index dab0dd7..f0b2d2d 100644
--- a/plugins/eu.hydrologis.jgrass.ui.utilities/src/eu/hydrologis/jgrass/ui/utilities/JGRasterCatalogTreeViewer.java
+++ b/plugins/eu.hydrologis.jgrass.ui.utilities/src/eu/hydrologis/jgrass/ui/utilities/JGRasterCatalogTreeViewer.java
@@ -328,7 +328,7 @@ public class JGRasterCatalogTreeViewer extends Composite
listeners = new ArrayList<ILabelProviderListener>();
// Create the images
- rasterMaps = CatalogUIPlugin.getDefault().getImages().getImageDescriptor(
+ rasterMaps = CatalogUIPlugin.getDefault().getImageDescriptor(
ISharedImages.GRID_OBJ).createImage();
mainRasterMaps = AbstractUIPlugin.imageDescriptorFromPlugin(JGrassPlugin.PLUGIN_ID,
"icons/obj16/jgrass_obj.gif").createImage(); //$NON-NLS-1$
diff --git a/plugins/eu.hydrologis.jgrass.ui.utilities/src/eu/hydrologis/jgrass/ui/utilities/JGRasterLayerTreeViewer.java b/plugins/eu.hydrologis.jgrass.ui.utilities/src/eu/hydrologis/jgrass/ui/utilities/JGRasterLayerTreeViewer.java
index de3e676..053bc2d 100644
--- a/plugins/eu.hydrologis.jgrass.ui.utilities/src/eu/hydrologis/jgrass/ui/utilities/JGRasterLayerTreeViewer.java
+++ b/plugins/eu.hydrologis.jgrass.ui.utilities/src/eu/hydrologis/jgrass/ui/utilities/JGRasterLayerTreeViewer.java
@@ -321,7 +321,7 @@ public class JGRasterLayerTreeViewer extends Composite
listeners = new ArrayList<ILabelProviderListener>();
// Create the images
- rasterMaps = CatalogUIPlugin.getDefault().getImages().getImageDescriptor(
+ rasterMaps = CatalogUIPlugin.getDefault().getImageDescriptor(
ISharedImages.GRID_OBJ).createImage();
mainRasterMaps = AbstractUIPlugin.imageDescriptorFromPlugin(JGrassPlugin.PLUGIN_ID,
"icons/obj16/jgrass_obj.gif").createImage(); //$NON-NLS-1$
diff --git a/plugins/eu.hydrologis.jgrass.ui/src/eu/hydrologis/jgrass/ui/wizards/DxfImportWizard.java b/plugins/eu.hydrologis.jgrass.ui/src/eu/hydrologis/jgrass/ui/wizards/DxfImportWizard.java
index 561ade5..5558dcc 100644
--- a/plugins/eu.hydrologis.jgrass.ui/src/eu/hydrologis/jgrass/ui/wizards/DxfImportWizard.java
+++ b/plugins/eu.hydrologis.jgrass.ui/src/eu/hydrologis/jgrass/ui/wizards/DxfImportWizard.java
@@ -45,7 +45,6 @@ import org.geotools.data.simple.SimpleFeatureCollection;
import org.geotools.feature.FeatureCollection;
import org.geotools.referencing.CRS;
import org.jgrasstools.gears.io.dxfdwg.DxfFeatureReader;
-import org.jgrasstools.gears.io.dxfdwg.libs.dxf.DxfFile;
import org.opengis.feature.simple.SimpleFeature;
import org.opengis.feature.simple.SimpleFeatureType;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
_______________________________________________
User-friendly Desktop Internet GIS (uDig)
http://udig.refractions.net
http://lists.refractions.net/mailman/listinfo/udig-devel
