Revision: 6046
http://sourceforge.net/p/jump-pilot/code/6046
Author: ma15569
Date: 2018-12-28 14:07:59 +0000 (Fri, 28 Dec 2018)
Log Message:
-----------
rearrange icon management. Added getName() to PickPlugIn and PickTool to
prevent warning messeges
Modified Paths:
--------------
plug-ins/Color_chooser/trunk/src/org/openjump/core/ui/plugin/colorchooser/FeatureColorChooserPlugIn.java
plug-ins/Color_chooser/trunk/src/org/openjump/core/ui/plugin/colorchooser/PickPlugIn.java
plug-ins/Color_chooser/trunk/src/org/openjump/core/ui/plugin/colorchooser/PickTool.java
Added Paths:
-----------
plug-ins/Color_chooser/trunk/src/images/
plug-ins/Color_chooser/trunk/src/images/ColorChooserIconLoader.java
plug-ins/Color_chooser/trunk/src/images/color-swatch.png
plug-ins/Color_chooser/trunk/src/images/pipette-cursor.gif
plug-ins/Color_chooser/trunk/src/images/pipette.png
Removed Paths:
-------------
plug-ins/Color_chooser/trunk/src/org/openjump/core/ui/plugin/colorchooser/color-swatch.png
plug-ins/Color_chooser/trunk/src/org/openjump/core/ui/plugin/colorchooser/pipette-cursor.gif
plug-ins/Color_chooser/trunk/src/org/openjump/core/ui/plugin/colorchooser/pipette.png
Added: plug-ins/Color_chooser/trunk/src/images/ColorChooserIconLoader.java
===================================================================
--- plug-ins/Color_chooser/trunk/src/images/ColorChooserIconLoader.java
(rev 0)
+++ plug-ins/Color_chooser/trunk/src/images/ColorChooserIconLoader.java
2018-12-28 14:07:59 UTC (rev 6046)
@@ -0,0 +1,50 @@
+/*
+ * The Unified Mapping Platform (JUMP) is an extensible, interactive GUI
+ * for visualizing and manipulating spatial features with geometry and
attributes.
+ *
+ * Copyright (C) 2003 Vivid Solutions
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * For more information, contact:
+ *
+ * Vivid Solutions
+ * Suite #1A
+ * 2328 Government Street
+ * Victoria BC V8T 5G5
+ * Canada
+ *
+ * (250)385-6040
+ * www.vividsolutions.com
+ */
+
+package images;
+
+import java.awt.Image;
+
+import javax.swing.ImageIcon;
+
+/**
+ * Gets an icon from this class' package.
+ */
+public class ColorChooserIconLoader {
+ public static ImageIcon icon(String filename) {
+ return new
ImageIcon(ColorChooserIconLoader.class.getResource(filename));
+ }
+
+ public static Image image(String filename) {
+ return ColorChooserIconLoader.icon(filename).getImage();
+ }
+}
Property changes on:
plug-ins/Color_chooser/trunk/src/images/ColorChooserIconLoader.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: plug-ins/Color_chooser/trunk/src/images/color-swatch.png
===================================================================
(Binary files differ)
Index: plug-ins/Color_chooser/trunk/src/images/color-swatch.png
===================================================================
--- plug-ins/Color_chooser/trunk/src/images/color-swatch.png 2018-12-27
20:56:28 UTC (rev 6045)
+++ plug-ins/Color_chooser/trunk/src/images/color-swatch.png 2018-12-28
14:07:59 UTC (rev 6046)
Property changes on: plug-ins/Color_chooser/trunk/src/images/color-swatch.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: plug-ins/Color_chooser/trunk/src/images/pipette-cursor.gif
===================================================================
(Binary files differ)
Index: plug-ins/Color_chooser/trunk/src/images/pipette-cursor.gif
===================================================================
--- plug-ins/Color_chooser/trunk/src/images/pipette-cursor.gif 2018-12-27
20:56:28 UTC (rev 6045)
+++ plug-ins/Color_chooser/trunk/src/images/pipette-cursor.gif 2018-12-28
14:07:59 UTC (rev 6046)
Property changes on: plug-ins/Color_chooser/trunk/src/images/pipette-cursor.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: plug-ins/Color_chooser/trunk/src/images/pipette.png
===================================================================
(Binary files differ)
Index: plug-ins/Color_chooser/trunk/src/images/pipette.png
===================================================================
--- plug-ins/Color_chooser/trunk/src/images/pipette.png 2018-12-27 20:56:28 UTC
(rev 6045)
+++ plug-ins/Color_chooser/trunk/src/images/pipette.png 2018-12-28 14:07:59 UTC
(rev 6046)
Property changes on: plug-ins/Color_chooser/trunk/src/images/pipette.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified:
plug-ins/Color_chooser/trunk/src/org/openjump/core/ui/plugin/colorchooser/FeatureColorChooserPlugIn.java
===================================================================
---
plug-ins/Color_chooser/trunk/src/org/openjump/core/ui/plugin/colorchooser/FeatureColorChooserPlugIn.java
2018-12-27 20:56:28 UTC (rev 6045)
+++
plug-ins/Color_chooser/trunk/src/org/openjump/core/ui/plugin/colorchooser/FeatureColorChooserPlugIn.java
2018-12-28 14:07:59 UTC (rev 6046)
@@ -1,5 +1,7 @@
package org.openjump.core.ui.plugin.colorchooser;
+import images.ColorChooserIconLoader;
+
import java.awt.Color;
import java.awt.Component;
import java.awt.Graphics;
@@ -247,20 +249,19 @@
colorPickerPopup = popup;
colorSetbutton.setToolTipText(I18NPlug.getI18N("set-color-Tool"));
colorChooserButton.setToolTipText(I18NPlug.getI18N("pick-color-tools"));
- /*
context.getWorkbenchContext().getWorkbench().getFrame().getToolBar()
- .addSeparator();
-
context.getWorkbenchContext().getWorkbench().getFrame().getToolBar()
- .add(colorSetbutton);
-
context.getWorkbenchContext().getWorkbench().getFrame().getToolBar()
- .add(colorChooserButton);
-
context.getWorkbenchContext().getWorkbench().getFrame().getToolBar()
- .addSeparator();*/
+ context.getWorkbenchContext().getWorkbench().getFrame().getToolBar()
+ .addSeparator();
+ context.getWorkbenchContext().getWorkbench().getFrame().getToolBar()
+ .add(colorSetbutton);
+ context.getWorkbenchContext().getWorkbench().getFrame().getToolBar()
+ .add(colorChooserButton);
+ context.getWorkbenchContext().getWorkbench().getFrame().getToolBar()
+ .addSeparator();
}
public Icon getColorIcon() {
- final ImageIcon icon = new ImageIcon(getClass().getResource(
- "color-swatch.png"));
+ final ImageIcon icon = ColorChooserIconLoader.icon("color-swatch.png");
return GUIUtil.toSmallIcon(icon);
}
@@ -270,8 +271,7 @@
}
public Icon getPickColorIcon() {
- final ImageIcon icon2 = new ImageIcon(getClass().getResource(
- "pipette.png"));
+ final ImageIcon icon2 = ColorChooserIconLoader.icon("pipette.png");
return GUIUtil.toSmallIcon(icon2);
}
Modified:
plug-ins/Color_chooser/trunk/src/org/openjump/core/ui/plugin/colorchooser/PickPlugIn.java
===================================================================
---
plug-ins/Color_chooser/trunk/src/org/openjump/core/ui/plugin/colorchooser/PickPlugIn.java
2018-12-27 20:56:28 UTC (rev 6045)
+++
plug-ins/Color_chooser/trunk/src/org/openjump/core/ui/plugin/colorchooser/PickPlugIn.java
2018-12-28 14:07:59 UTC (rev 6046)
@@ -36,52 +36,38 @@
import javax.swing.Icon;
-import com.vividsolutions.jump.I18N;
+import language.I18NPlug;
+
+import com.vividsolutions.jump.workbench.Logger;
import com.vividsolutions.jump.workbench.plugin.AbstractPlugIn;
import com.vividsolutions.jump.workbench.plugin.PlugInContext;
-import com.vividsolutions.jump.workbench.ui.MenuNames;
-import com.vividsolutions.jump.workbench.ui.images.IconLoader;
public class PickPlugIn extends AbstractPlugIn {
- private final static String sErrorSeeOutputWindow = I18N
-
.get("org.openjump.core.ui.plugin.tools.MeasureM_FPlugIn.Error-see-output-window");
-
+ @Override
public void initialize(PlugInContext context) throws Exception {
-
- context.getFeatureInstaller()
- .addMainMenuPlugin(
- this,
- new String[] { MenuNames.RASTER },
- // new String[] {MenuNames.PLUGINS,
- // I18NPlug.getI18N("RasterInfo_Extension")},
-
I18N.get("org.openjump.core.ui.plugin.raster.RasterQueryPlugIn"),
- false, getIcon(), null);
-
+ super.initialize(context);
}
+ @Override
public boolean execute(PlugInContext context) throws Exception {
try {
context.getLayerViewPanel().setCurrentCursorTool(new PickTool());
return true;
- } catch (Exception e) {
- e.printStackTrace();
- context.getWorkbenchFrame().warnUser(sErrorSeeOutputWindow);
- context.getWorkbenchFrame().getOutputFrame().createNewDocument();
- context.getWorkbenchFrame().getOutputFrame()
- .addText("MeasureM_FPlugIn Exception:" + e.toString());
+ } catch (final Exception e) {
+ Logger.error(e);
return false;
}
}
- /*
- * private Icon getIcon() {
- *
- * return IconLoader.icon("Raster_Info.png"); }
- */
public Icon getIcon() {
- return IconLoader.icon("grid_info.png");
+ return null;
}
+ @Override
+ public String getName() {
+ return I18NPlug.getI18N("picker-color");
+ }
+
}
Modified:
plug-ins/Color_chooser/trunk/src/org/openjump/core/ui/plugin/colorchooser/PickTool.java
===================================================================
---
plug-ins/Color_chooser/trunk/src/org/openjump/core/ui/plugin/colorchooser/PickTool.java
2018-12-27 20:56:28 UTC (rev 6045)
+++
plug-ins/Color_chooser/trunk/src/org/openjump/core/ui/plugin/colorchooser/PickTool.java
2018-12-28 14:07:59 UTC (rev 6046)
@@ -1,5 +1,7 @@
package org.openjump.core.ui.plugin.colorchooser;
+import images.ColorChooserIconLoader;
+
import java.awt.Color;
import java.awt.Cursor;
import java.awt.geom.NoninvertibleTransformException;
@@ -9,7 +11,6 @@
import java.util.Map;
import javax.swing.Icon;
-import javax.swing.ImageIcon;
import language.I18NPlug;
@@ -20,10 +21,7 @@
import com.vividsolutions.jts.geom.GeometryFactory;
import com.vividsolutions.jts.geom.Point;
import com.vividsolutions.jump.feature.Feature;
-import com.vividsolutions.jump.feature.FeatureCollectionWrapper;
-import com.vividsolutions.jump.feature.FeatureSchema;
import com.vividsolutions.jump.geom.EnvelopeUtil;
-import com.vividsolutions.jump.workbench.WorkbenchContext;
import com.vividsolutions.jump.workbench.model.Layer;
import com.vividsolutions.jump.workbench.ui.cursortool.NClickTool;
import com.vividsolutions.jump.workbench.ui.cursortool.SpecifyFeaturesTool;
@@ -47,28 +45,26 @@
.get(0));
}
+ @Override
protected void gestureFinished() throws Exception {
reportNothingToUndoYet();
try {
- final WorkbenchContext wbcontext =
this.getWorkbench().getContext();
- Layer layer = wbcontext.createPlugInContext().getSelectedLayer(0);
- FeatureCollectionWrapper fcw = layer.getFeatureCollectionWrapper();
- FeatureSchema schema = fcw.getFeatureSchema();
- Coordinate coord = (Coordinate) getCoordinates().get(0);
- Point2D point = getPanel().getViewport().toViewPoint(coord);
- int PIXEL_BUFFER = 2;
+ final Coordinate coord = (Coordinate) getCoordinates().get(0);
+ final Point2D point = getPanel().getViewport().toViewPoint(coord);
+ final int PIXEL_BUFFER = 2;
// if (schema.hasAttribute(R_G_B)) {
- Map map = SpecifyFeaturesTool.layerToSpecifiedFeaturesMap(panel
- .getLayerManager().iterator(), EnvelopeUtil.expand(
- new Envelope(panel.getViewport().toModelCoordinate(point)),
- PIXEL_BUFFER / panel.getViewport().getScale()));
+ final Map map = SpecifyFeaturesTool.layerToSpecifiedFeaturesMap(
+ panel.getLayerManager().iterator(), EnvelopeUtil.expand(
+ new Envelope(panel.getViewport().toModelCoordinate(
+ point)), PIXEL_BUFFER
+ / panel.getViewport().getScale()));
- String hex = findValue(R_G_B, map);
- Color color = ColorUtils.hexToColorRGB(hex);
+ final String hex = findValue(R_G_B, map);
+ final Color color = ColorUtils.hexToColorRGB(hex);
FeatureColorChooserPlugIn.colorSetbutton.setColor(color);
- String acad = ColorUtils.getColorIndexRegistry(hex);
- this.getWorkbench()
+ final String acad = ColorUtils.getColorIndexRegistry(hex);
+ getWorkbench()
.getContext()
.getWorkbench()
.getFrame()
@@ -78,13 +74,18 @@
+ color.getRed() + "," + color.getGreen()
+ "," + color.getBlue(), 5000);
- } catch (Exception e) {
- this.getWorkbench().getContext().getWorkbench().getFrame()
+ } catch (final Exception e) {
+ getWorkbench().getContext().getWorkbench().getFrame()
.setStatusMessage(I18NPlug.getI18N("msg1"), 5000);
}
}
@Override
+ public String getName() {
+ return I18NPlug.getI18N("picker-color");
+ }
+
+ @Override
public Icon getIcon() {
// TODO Auto-generated method stub
return null;
@@ -92,15 +93,14 @@
@Override
public Cursor getCursor() {
- return createCursor(new ImageIcon(getClass().getResource(
- "pick-color-cursor.gif")).getImage()); //$NON-NLS-1$
+ return
createCursor(ColorChooserIconLoader.image("pipette-cursor.gif")); //$NON-NLS-1$
}
private String findValue(String attributeName,
Map layerToSpecifiedFeaturesMap) {
- for (Iterator i = layerToSpecifiedFeaturesMap.keySet().iterator(); i
+ for (final Iterator i =
layerToSpecifiedFeaturesMap.keySet().iterator(); i
.hasNext();) {
- Layer layer = (Layer) i.next();
+ final Layer layer = (Layer) i.next();
for (int j = 0; j < layer.getFeatureCollectionWrapper()
.getFeatureSchema().getAttributeCount(); j++) {
if ("fid".equalsIgnoreCase(attributeName)) {
Deleted:
plug-ins/Color_chooser/trunk/src/org/openjump/core/ui/plugin/colorchooser/color-swatch.png
===================================================================
(Binary files differ)
Deleted:
plug-ins/Color_chooser/trunk/src/org/openjump/core/ui/plugin/colorchooser/pipette-cursor.gif
===================================================================
(Binary files differ)
Deleted:
plug-ins/Color_chooser/trunk/src/org/openjump/core/ui/plugin/colorchooser/pipette.png
===================================================================
(Binary files differ)
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
