[JPP-Devel] SVN: [6376] plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/ extensions/SextanteToolboxPlugin.java
Revision: 6376
http://sourceforge.net/p/jump-pilot/code/6376
Author: ma15569
Date: 2020-08-17 05:19:44 + (Mon, 17 Aug 2020)
Log Message:
---
Try to solve error found by Ede: [JPP-Devel] bsh sextante NPE in latest
checkout. 2020-08-04. Tecnically SextanteGUI.initialize() will be enough to
load GUI. Pratically some aspects of GUI are substituted, like "Raster
Calculator" buttons and input areas, with the standard interface.
Modified Paths:
--
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/extensions/SextanteToolboxPlugin.java
Modified:
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/extensions/SextanteToolboxPlugin.java
===
---
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/extensions/SextanteToolboxPlugin.java
2020-08-16 16:48:26 UTC (rev 6375)
+++
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/extensions/SextanteToolboxPlugin.java
2020-08-17 05:19:44 UTC (rev 6376)
@@ -28,167 +28,176 @@
import es.unex.sextante.openjump.language.I18NPlug;
public class SextanteToolboxPlugin implements PlugIn {
-// static WorkbenchFrame wFrame = JUMPWorkbench.getInstance().getFrame();
+ // static WorkbenchFrame wFrame =
JUMPWorkbench.getInstance().getFrame();
-@Override
-public boolean execute(final PlugInContext context) throws Exception {
-// [Giuseppe Aruta 2018-04-08] open as OJ internal frame
-// Deactivated to further tests as algorithms are not correctly
selected
-// in the JInternalFrame
+ @Override
+ public boolean execute(final PlugInContext context) throws Exception {
+ // [Giuseppe Aruta 2018-04-08] open as OJ internal frame
+ // Deactivated to further tests as algorithms are not correctly
selected
+ // in the JInternalFrame
-// JFrame frame = context.getWorkbenchFrame();
-// for (JInternalFrame iFrame : wFrame.getInternalFrames()) {
-// if (iFrame instanceof ToolboxFrame) {
-//
-// iFrame.toFront();
-// return false;
-//
-// }
-// }
-// ToolboxFrame tframe = new ToolboxFrame(frame);
-// wFrame.addInternalFrame(tframe, true, true);
-// SextanteGUI.getInputFactory().clearDataObjects();
+ // JFrame frame = context.getWorkbenchFrame();
+ // for (JInternalFrame iFrame : wFrame.getInternalFrames()) {
+ // if (iFrame instanceof ToolboxFrame) {
+ //
+ // iFrame.toFront();
+ // return false;
+ //
+ // }
+ // }
+ // ToolboxFrame tframe = new ToolboxFrame(frame);
+ // wFrame.addInternalFrame(tframe, true, true);
+ // SextanteGUI.getInputFactory().clearDataObjects();
-SextanteGUI.getGUIFactory().showToolBoxDialog();
+ SextanteGUI.getGUIFactory().showToolBoxDialog();
-return true;
+ return true;
-}
+ }
-@Override
-public String getName() {
+ @Override
+ public String getName() {
-return I18NPlug
-
.getI18N("es.unex.sextante.kosmo.extensions.SextanteToolboxPlugin.Sextante-toolbox");
+ return I18NPlug
+
.getI18N("es.unex.sextante.kosmo.extensions.SextanteToolboxPlugin.Sextante-toolbox");
-}
+ }
-public void initialize_old(final PlugInContext context) throws Exception {
+ public void initialize_old(final PlugInContext context) throws
Exception {
-context.getFeatureInstaller().addMainMenuPlugin(this,
-new String[] { "Sextante" }, getName(), false, getIcon(),
null);
+ context.getFeatureInstaller().addMainMenuPlugin(this,
+ new String[] { "Sextante" }, getName(), false,
getIcon(), null);
-}
+ }
-@Override
-public void initialize(PlugInContext context) throws Exception {
-final String sextantePath = getJarsFolder();
-Sextante.initialize(sextantePath);
-SextanteGUI.setSextantePath(sextantePath);
+ @Override
+ public void initialize(PlugInContext context) throws Exception {
+ final String sextantePath = getJarsFolder();
+ Sextante.initialize(sextantePath);
+ SextanteGUI.setSextantePath(sextantePath);
-final List algorithmProviders =
getAlgorithmProvidersFromFolder(sextantePath);
-for (final IAlgorithmProvider provider : algorithmProviders) {
-if (!containsProvider(provider)) {
-SextanteGUI.addAlgorithmProvider(provider);
-}
-}
-SextanteGUI.initialize(sextantePath);
-SextanteGUI.setMainFrame(context.getWorkbenchFrame());
-SextanteGUI.setOutputFactory(new OpenJUMPOutputFactory(context
-
Re: [JPP-Devel] batik upgraded
done in r6375. to batik 1.6.1 instead of 1.6 though. would you mind doublechecking that it works as expected again? ..ede On 16.08.2020 16:01, Giuseppe Aruta wrote: > I suggest to move back to Batik 1.6 and to keep the option to move either > to smaller SVG lib or a newer Batik for OpenJUMP JTS+15 > > Il giorno dom 16 ago 2020 alle ore 14:47 Michaud Michael < > m.michael.mich...@orange.fr> ha scritto: > >> Hi, >> >> It would be nice to know exactly what is wrong with batik1.13. Sometimes, >> third party libraries just become more strict, >> >> and in that case, it can be useful to fix the code on OpenJUMP side >> whatever the final solution choosen. >> >> Michaël >> >> envoyé : 16 août 2020 à 14:31 >> de : edgar.sol...@web.de >> à : OpenJump develop and use , >> Giuseppe Aruta >> objet : Re: [JPP-Devel] batik upgraded >> >> >> On 16.08.2020 13:07, Giuseppe Aruta wrote: >> >> Hi all, >> this issue was not closed: moving to newer batik broke SVG export for both >> embedded OpeJUMP "Export view" and CadPlan Printer view plugin. >> >> yeah, didn't hear back from you guys. so we are agreed thta i'll roll back >> the upgrade to the latest working batik 1.6 . >> >> also Peppe is totally right, batik is a big (in terms of space) dependency >> for a very small feat (svg export). we should probably change that. >> >> ..ede >> >> >> ___ >> Jump-pilot-devel mailing list >> Jump-pilot-devel@lists.sourceforge.net >> https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel >> >> ___ >> Jump-pilot-devel mailing list >> Jump-pilot-devel@lists.sourceforge.net >> https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel >> > > > > ___ > Jump-pilot-devel mailing list > Jump-pilot-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel > ___ Jump-pilot-devel mailing list Jump-pilot-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
[JPP-Devel] SVN: [6375] core/trunk
Revision: 6375 http://sourceforge.net/p/jump-pilot/code/6375 Author: edso Date: 2020-08-16 16:48:26 + (Sun, 16 Aug 2020) Log Message: --- revert batik upgrade but raise from batik 1.6 to 1.6.1 still, holding fingers crossed Modified Paths: -- core/trunk/ChangeLog core/trunk/pom.xml core/trunk/src/org/openjump/sextante/gui/additionalResults/AdditionalResultsIO.java Added Paths: --- core/trunk/lib/batik-all-1.6.1.jar Removed Paths: - core/trunk/lib/batik-all-1.13.jar Modified: core/trunk/ChangeLog === --- core/trunk/ChangeLog2020-08-09 17:59:45 UTC (rev 6374) +++ core/trunk/ChangeLog2020-08-16 16:48:26 UTC (rev 6375) @@ -4,6 +4,10 @@ # 3. be concise but convey the change in a way that ordinary users understand #< 80 chars --># +2020-08-16 ede + * reverted apache batik (used for svg rendering) to 1.6 due to +incompatibilities with printing extensions (Sky/Cadplan) + 2020-08-09 mmichaud * #494 : upgrade csv driver to 1.1.0 + hungarian i18n file Deleted: core/trunk/lib/batik-all-1.13.jar === (Binary files differ) Added: core/trunk/lib/batik-all-1.6.1.jar === (Binary files differ) Index: core/trunk/lib/batik-all-1.6.1.jar === --- core/trunk/lib/batik-all-1.6.1.jar 2020-08-09 17:59:45 UTC (rev 6374) +++ core/trunk/lib/batik-all-1.6.1.jar 2020-08-16 16:48:26 UTC (rev 6375) Property changes on: core/trunk/lib/batik-all-1.6.1.jar ___ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: core/trunk/pom.xml === --- core/trunk/pom.xml 2020-08-09 17:59:45 UTC (rev 6374) +++ core/trunk/pom.xml 2020-08-16 16:48:26 UTC (rev 6375) @@ -922,27 +922,27 @@ compile -org.apache.xmlgraphics +batik batik-awt-util -1.13 +1.6-1 compile -org.apache.xmlgraphics +batik batik-dom -1.13 +1.6-1 compile -org.apache.xmlgraphics +batik batik-svggen -1.13 +1.6-1 compile -org.apache.xmlgraphics +batik batik-squiggle -1.13 +1.6-1 compile Modified: core/trunk/src/org/openjump/sextante/gui/additionalResults/AdditionalResultsIO.java === --- core/trunk/src/org/openjump/sextante/gui/additionalResults/AdditionalResultsIO.java 2020-08-09 17:59:45 UTC (rev 6374) +++ core/trunk/src/org/openjump/sextante/gui/additionalResults/AdditionalResultsIO.java 2020-08-16 16:48:26 UTC (rev 6375) @@ -27,7 +27,7 @@ import javax.swing.tree.TreePath; import javax.xml.namespace.QName; -import org.apache.batik.anim.dom.SVGDOMImplementation; +import org.apache.batik.dom.svg.SVGDOMImplementation; import org.apache.batik.svggen.SVGGraphics2D; import org.apache.log4j.Logger; import org.math.plot.PlotPanel; @@ -37,7 +37,7 @@ import org.openjump.core.ui.util.LayerableUtil; import org.openjump.sextante.core.ObjectAndDescription; import org.w3c.dom.DOMImplementation; -import org.w3c.dom.Document; +import org.w3c.dom.svg.SVGDocument; import com.vividsolutions.jump.I18N; import com.vividsolutions.jump.feature.FeatureCollection; @@ -401,7 +401,7 @@ // Get a SVGDOMImplementation and create an XML document DOMImplementation domImpl = SVGDOMImplementation.getDOMImplementation(); String svgNS = "http://www.w3.org/2000/svg";; - Document svgDocument = domImpl.createDocument(svgNS, "svg", null); + SVGDocument svgDocument = (SVGDocument) domImpl.createDocument(svgNS, "svg", null); // Create an instance of the SVG Generator SVGGraphics2D svgGenerator = new SVGGraphics2D(svgDocument); ___ Jump-pilot-devel mailing list Jump-pilot-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
Re: [JPP-Devel] batik upgraded
I suggest to move back to Batik 1.6 and to keep the option to move either to smaller SVG lib or a newer Batik for OpenJUMP JTS+15 Il giorno dom 16 ago 2020 alle ore 14:47 Michaud Michael < m.michael.mich...@orange.fr> ha scritto: > Hi, > > It would be nice to know exactly what is wrong with batik1.13. Sometimes, > third party libraries just become more strict, > > and in that case, it can be useful to fix the code on OpenJUMP side > whatever the final solution choosen. > > Michaël > > envoyé : 16 août 2020 à 14:31 > de : edgar.sol...@web.de > à : OpenJump develop and use , > Giuseppe Aruta > objet : Re: [JPP-Devel] batik upgraded > > > On 16.08.2020 13:07, Giuseppe Aruta wrote: > > Hi all, > this issue was not closed: moving to newer batik broke SVG export for both > embedded OpeJUMP "Export view" and CadPlan Printer view plugin. > > yeah, didn't hear back from you guys. so we are agreed thta i'll roll back > the upgrade to the latest working batik 1.6 . > > also Peppe is totally right, batik is a big (in terms of space) dependency > for a very small feat (svg export). we should probably change that. > > ..ede > > > ___ > Jump-pilot-devel mailing list > Jump-pilot-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel > > ___ > Jump-pilot-devel mailing list > Jump-pilot-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel > ___ Jump-pilot-devel mailing list Jump-pilot-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
Re: [JPP-Devel] batik upgraded
Hi,It would be nice to know exactly what is wrong with batik1.13. Sometimes, third party libraries just become more strict, and in that case, it can be useful to fix the code on OpenJUMP side whatever the final solution choosen.Michaël envoyé : 16 août 2020 à 14:31de : edgar.sol...@web.deà : OpenJump develop and use , Giuseppe Aruta objet : Re: [JPP-Devel] batik upgradedOn 16.08.2020 13:07, Giuseppe Aruta wrote:Hi all,this issue was not closed: moving to newer batik broke SVG export for bothembedded OpeJUMP "Export view" and CadPlan Printer view plugin.yeah, didn't hear back from you guys. so we are agreed thta i'll roll back the upgrade to the latest working batik 1.6 .also Peppe is totally right, batik is a big (in terms of space) dependency for a very small feat (svg export). we should probably change that...ede___Jump-pilot-devel mailing listJump-pilot-devel@lists.sourceforge.nethttps://lists.sourceforge.net/lists/listinfo/jump-pilot-devel ___ Jump-pilot-devel mailing list Jump-pilot-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
Re: [JPP-Devel] batik upgraded
On 16.08.2020 13:07, Giuseppe Aruta wrote: > Hi all, > this issue was not closed: moving to newer batik broke SVG export for both > embedded OpeJUMP "Export view" and CadPlan Printer view plugin. yeah, didn't hear back from you guys. so we are agreed thta i'll roll back the upgrade to the latest working batik 1.6 . also Peppe is totally right, batik is a big (in terms of space) dependency for a very small feat (svg export). we should probably change that. ..ede ___ Jump-pilot-devel mailing list Jump-pilot-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
[JPP-Devel] [jump-pilot:bugs] #486 OpenJUMP fails to read 4D geom from postgis
Check it again when we'll have a version of OpenJUMP based on JTS 1.5+ (see openjump-gis on github) --- ** [bugs:#486] OpenJUMP fails to read 4D geom from postgis** **Status:** open **Created:** Tue May 21, 2019 06:17 AM UTC by michael michaud **Last Updated:** Tue May 21, 2019 06:17 AM UTC **Owner:** michael michaud 4D Geometries (geometries with Z ad M values) are not read correctly from OpenJUMP. 4D coordinates seem to be read as if they were 3D, and the fourth ordinate is read as the first ordinate of the next point. As OpenJUMP use WKBReader from JTS, the problem maybe solved in the latest JTSversion, but we never switched to the new locationtech distribution. --- Sent from sourceforge.net because jump-pilot-devel@lists.sourceforge.net is subscribed to https://sourceforge.net/p/jump-pilot/bugs/ To unsubscribe from further messages, a project admin can change settings at https://sourceforge.net/p/jump-pilot/admin/bugs/options. Or, if this is a mailing list, you can unsubscribe from the mailing list.___ Jump-pilot-devel mailing list Jump-pilot-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
Re: [JPP-Devel] batik upgraded
Hi all, this issue was not closed: moving to newer batik broke SVG export for both embedded OpeJUMP "Export view" and CadPlan Printer view plugin. I was thinking that 16 jar files and 2.6 Mb (Apache NBatiks) was a large amount if we consider that these libraries are only used for 3 plugins. I found this page http://www.object-refinery.com/blog/blog-20140423.html where Batik lib vs JFreeSVG libraries are compared. And I realize that: a) we possibly don't need all Batik classes. According to the page only these file are needed: - batik-dom.jar (173,750 bytes); - batik-svggen.jar (215,802 bytes); - batik-awt-util.jar (403,287 bytes); - batik-util.jar (128,334 bytes); - batik-ext.jar (10,261 bytes); - batik-xml.jar (30,862 bytes) For around 1 Mb b) Is there a way to migrate to JFreeSVG? I realize that we use Apache Batik only to export to SVG Batik classes are involved in these classes: -Export objects to SVG - SaveImageAsPlugIn - SaveVImageAsSVGPlugIn ha scritto: > hey All, > > had to touch batik, as it was missing some classes in trunk/lib/batik.jar > after Peppe added AdditionalResultsIO. maven already had the proper batik > components defined that's why the snapshot builds went fine. > > while at it i noticed that we were using a quite old batik version and > upgraded it. looks good to me but please test and come back if something > breaks horribly. > > sunshine all over.. (sweating) ede > > Forwarded Message > Subject: [JPP-Devel] SVN: [6369] core/trunk > Date: Wed, 05 Aug 2020 12:50:50 + > From: jump-pilot-svn--- via Jump-pilot-devel < > jump-pilot-devel@lists.sourceforge.net> > Reply-To: OpenJump develop and use > > To: jump-pilot-devel@lists.sourceforge.net > CC: jump-pilot-...@lists.sourceforge.net > > Revision: 6369 > http://sourceforge.net/p/jump-pilot/code/6369 > Author: edso > Date: 2020-08-05 12:50:49 + (Wed, 05 Aug 2020) > Log Message: > --- > upgrade batik to latest greatest v1.13 > minimal fixup of AdditonalResultsIO > fingers crossed, let's see if it breaks something more > > Modified Paths: > -- > core/trunk/pom.xml > > core/trunk/src/org/openjump/sextante/gui/additionalResults/AdditionalResultsIO.java > > Added Paths: > --- > core/trunk/lib/batik-all-1.13.jar > > Removed Paths: > - > core/trunk/lib/batik-all.jar > > Added: core/trunk/lib/batik-all-1.13.jar > === > (Binary files differ) > > Index: core/trunk/lib/batik-all-1.13.jar > === > --- core/trunk/lib/batik-all-1.13.jar 2020-08-05 12:45:12 UTC (rev 6368) > +++ core/trunk/lib/batik-all-1.13.jar 2020-08-05 12:50:49 UTC (rev 6369) > > Property changes on: core/trunk/lib/batik-all-1.13.jar > ___ > Added: svn:mime-type > ## -0,0 +1 ## > +application/octet-stream > \ No newline at end of property > Deleted: core/trunk/lib/batik-all.jar > === > (Binary files differ) > > Modified: core/trunk/pom.xml > === > --- core/trunk/pom.xml 2020-08-05 12:45:12 UTC (rev 6368) > +++ core/trunk/pom.xml 2020-08-05 12:50:49 UTC (rev 6369) > @@ -924,25 +924,25 @@ > > batik > batik-awt-util > -1.6 > +1.13 > compile > > > batik > batik-dom > -1.6 > +1.13 > compile > > > batik > batik-svggen > -1.6 > +1.13 > compile > > > batik > batik-squiggle > -1.6 > +1.13 > compile > > > > Modified: > core/trunk/src/org/openjump/sextante/gui/additionalResults/AdditionalResultsIO.java > === > --- > core/trunk/src/org/openjump/sextante/gui/additionalResults/AdditionalResultsIO.java > 2020-08-05 12:45:12 UTC (rev 6368) > +++ > core/trunk/src/org/openjump/sextante/gui/additionalResults/AdditionalResultsIO.java > 2020-08-05 12:50:49 UTC (rev 6369) > @@ -27,7 +27,7 @@ > import javax.swing.tree.TreePath; > import javax.xml.namespace.QName; > > -import org.apache.batik.dom.svg.SVGDOMImplementation; > +import org.apache.batik.anim.dom.SVGDOMImplementation; > import org.apache.batik.svggen.SVGGraphics2D; > import org.apache.log4j.Logger; > import org.math.plot.PlotPanel; > @@ -37,7 +37,7 @@ > import org.openjump.core.ui.util.LayerableUtil; > import org.openjump.sextante.core.ObjectAndDescription; > import org.w3c.dom.DOMImplementation; > -import org.w3c.dom.svg.SVGDocument; > +import org.w3c.dom.Document; > > import com.vividsolution
