Revision: 5670
http://sourceforge.net/p/jump-pilot/code/5670
Author: ma15569
Date: 2018-01-13 16:38:55 +0000 (Sat, 13 Jan 2018)
Log Message:
-----------
Fix some Sextante dialog errors. Reactivated AdditionalResults frame
Modified Paths:
--------------
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/extensions/SextanteHelpPlugIn.java
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/extensions/SextanteResultsPlugin.java
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/extensions/SextanteToolboxPlugin.java
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/help/SextanteHelpFrame.java
Added Paths:
-----------
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/extensions/application_view.png
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/init/
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/init/OJSextanteApiInitialiser.java
Modified:
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/extensions/SextanteHelpPlugIn.java
===================================================================
---
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/extensions/SextanteHelpPlugIn.java
2018-01-13 12:54:53 UTC (rev 5669)
+++
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/extensions/SextanteHelpPlugIn.java
2018-01-13 16:38:55 UTC (rev 5670)
@@ -12,7 +12,7 @@
import com.vividsolutions.jump.workbench.ui.images.IconLoader;
import es.unex.sextante.gui.core.SextanteGUI;
-import es.unex.sextante.gui.help.SextanteHelpFrame;
+//import es.unex.sextante.openjump.help.SextanteHelpFrame;
import es.unex.sextante.gui.help.SextanteHelpWindow;
import es.unex.sextante.gui.toolbox.ToolboxFrame;
import es.unex.sextante.openjump.language.I18NPlug;
Modified:
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/extensions/SextanteResultsPlugin.java
===================================================================
---
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/extensions/SextanteResultsPlugin.java
2018-01-13 12:54:53 UTC (rev 5669)
+++
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/extensions/SextanteResultsPlugin.java
2018-01-13 16:38:55 UTC (rev 5670)
@@ -2,33 +2,68 @@
import java.util.ArrayList;
+import javax.swing.Icon;
import javax.swing.ImageIcon;
+import javax.swing.JInternalFrame;
+import javax.swing.JOptionPane;
import org.openjump.core.ui.plugin.AbstractUiPlugIn;
+import org.openjump.sextante.core.ObjectAndDescription;
+import org.openjump.sextante.gui.additionalResults.AdditionalResults;
+import org.openjump.sextante.gui.additionalResults.AdditionalResultsFrame;
+import com.vividsolutions.jump.I18N;
import com.vividsolutions.jump.workbench.plugin.PlugInContext;
-import es.unex.sextante.gui.additionalResults.AdditionalResults;
-import es.unex.sextante.gui.core.SextanteGUI;
import es.unex.sextante.openjump.language.I18NPlug;
+//import es.unex.sextante.gui.additionalResults.AdditionalResults;
+//import es.unex.sextante.gui.additionalResults.AdditionalResults;
+
public class SextanteResultsPlugin extends AbstractUiPlugIn {
public String NO_RESULTS = I18NPlug
.getI18N("es.unex.sextante.kosmo.extensions.SextanteResultsPlugin.Results.no_results");
+ private String sName = I18N
+
.get("org.openjump.sextante.gui.additionalResults.AdditionalResultsPlugIn.Result-viewer");
+ private static String sWarning = I18N
+
.get("org.openjump.sextante.gui.additionalResults.AdditionalResultsPlugIn.List-of-results-is-empty");
@Override
public boolean execute(final PlugInContext context) throws Exception {
- final ArrayList<?> results = AdditionalResults.getComponents();
- if (results.size() != 0) {
- SextanteGUI.getGUIFactory().showAdditionalResultsDialog(results);
+ ArrayList<ObjectAndDescription> m_Components =
AdditionalResults.m_Components;
+ if (m_Components == null || m_Components.size() == 0) {
+ JOptionPane.showMessageDialog(null, sWarning, sName,
+ JOptionPane.WARNING_MESSAGE);
+ return false;
+ } else {
+
+ for (JInternalFrame iFrame : context.getWorkbenchFrame()
+ .getInternalFrames()) {
+ if (iFrame instanceof AdditionalResultsFrame) {
+
+ iFrame.toFront();
+ return true;
+
+ }
+ }
+ AdditionalResultsFrame additionalResultsFrame = new
AdditionalResultsFrame(
+ m_Components);
+
+ context.getWorkbenchFrame()
+ .addInternalFrame(additionalResultsFrame);
+
}
- // else {
- // JOptionPane.showMessageDialog(null, NO_RESULTS,
- // Sextante.getText("Warning"), JOptionPane.WARNING_MESSAGE);
- // }
+ /*
+ * final ArrayList<?> results = AdditionalResults.getComponents(); if
+ * (results.size() != 0) {
+ * SextanteGUI.getGUIFactory().showAdditionalResultsDialog(results); }
+ *
+ * else { JOptionPane.showMessageDialog(null, NO_RESULTS,
+ * Sextante.getText("Warning"), JOptionPane.WARNING_MESSAGE); }
+ */
return true;
@@ -43,18 +78,21 @@
}
- public ImageIcon getIcon() {
+ @Override
+ /*
+ * public ImageIcon getIcon() {
+ *
+ * return new ImageIcon(SextanteGUI.class.getClassLoader().getResource(
+ * "images/chart.gif"));
+ *
+ * }
+ */
+ public Icon getIcon() {
+ return new ImageIcon(getClass().getResource("application_view.png"));
- return new ImageIcon(SextanteGUI.class.getClassLoader().getResource(
- "images/chart.gif"));
-
}
- /*
- * public ImageIcon getIcon() { return new
- * ImageIcon(getClass().getResource("reports.png")); }
- */
-
+ @Override
public void initialize(final PlugInContext context) throws Exception {
context.getFeatureInstaller().addMainMenuPlugin(this,
Modified:
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/extensions/SextanteToolboxPlugin.java
===================================================================
---
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/extensions/SextanteToolboxPlugin.java
2018-01-13 12:54:53 UTC (rev 5669)
+++
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/extensions/SextanteToolboxPlugin.java
2018-01-13 16:38:55 UTC (rev 5670)
@@ -16,22 +16,23 @@
public class SextanteToolboxPlugin implements PlugIn {
static WorkbenchFrame wFrame = JUMPWorkbench.getInstance().getFrame();
public boolean execute(final PlugInContext context) throws Exception {
- //[Giuseppe Aruta 2017-12-12] open as OJ internal frame
- JFrame frame = context.getWorkbenchFrame();
- for (JInternalFrame iFrame : wFrame.getInternalFrames()) {
- if (iFrame instanceof ToolboxFrame) {
+ //[Giuseppe Aruta 2017-12-12] open as OJ internal frame
+ // Deactivated to further tests
+ // 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();
- iFrame.toFront();
- return false;
+ SextanteGUI.getGUIFactory().showToolBoxDialog();
- }
- }
- ToolboxFrame tframe = new ToolboxFrame(frame);
- wFrame.addInternalFrame(tframe, true, true);
- SextanteGUI.getInputFactory().clearDataObjects();
-
- // SextanteGUI.getGUIFactory().showToolBoxDialog();
-
return true;
}
Added:
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/extensions/application_view.png
===================================================================
(Binary files differ)
Index:
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/extensions/application_view.png
===================================================================
---
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/extensions/application_view.png
2018-01-13 12:54:53 UTC (rev 5669)
+++
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/extensions/application_view.png
2018-01-13 16:38:55 UTC (rev 5670)
Property changes on:
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/extensions/application_view.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified:
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/help/SextanteHelpFrame.java
===================================================================
---
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/help/SextanteHelpFrame.java
2018-01-13 12:54:53 UTC (rev 5669)
+++
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/help/SextanteHelpFrame.java
2018-01-13 16:38:55 UTC (rev 5670)
@@ -1,4 +1,4 @@
-package es.unex.sextante.gui.help;
+package es.unex.sextante.openjump.help;
import java.awt.BorderLayout;
import java.awt.Cursor;
Added:
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/init/OJSextanteApiInitialiser.java
===================================================================
---
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/init/OJSextanteApiInitialiser.java
(rev 0)
+++
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/init/OJSextanteApiInitialiser.java
2018-01-13 16:38:55 UTC (rev 5670)
@@ -0,0 +1,35 @@
+package es.unex.sextante.openjump.init;
+
+import com.vividsolutions.jump.workbench.plugin.PlugInContext;
+
+import es.unex.sextante.core.OutputFactory;
+import es.unex.sextante.core.Sextante;
+import es.unex.sextante.gui.core.SextanteGUI;
+import es.unex.sextante.openjump.core.OpenJUMPOutputFactory;
+
+/**
+ * Use this class to initialize Sextante from within an OpenJUMP plugin, and to
+ * check if Sextante is already initialized. I.e. first test if
+ * OJSextanteApiInitialiser.isInitialized is false and if so, then call
+ * OJSextanteApiInitialiser.initializeSextante()
+ *
+ * @author sstein
+ *
+ */
+public class OJSextanteApiInitialiser {
+
+ public static boolean isInitialized = false;
+
+ public static void initializeSextante(PlugInContext context) {
+ System.out.println("initializing Sextante version: "
+ + Sextante.getVersionNumber());
+ OutputFactory outputFactory = new OpenJUMPOutputFactory(
+ context.getWorkbenchContext());
+ Sextante.initialize();
+ SextanteGUI.initialize();
+ SextanteGUI.setOutputFactory(outputFactory);
+
+ OJSextanteApiInitialiser.isInitialized = true;
+ }
+
+}
Property changes on:
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/init/OJSextanteApiInitialiser.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
