Revision: 5835
http://sourceforge.net/p/jump-pilot/code/5835
Author: michaudm
Date: 2018-06-04 19:28:48 +0000 (Mon, 04 Jun 2018)
Log Message:
-----------
Use FeatureInstaller.getInstance(), don't use deprecated methods
Modified Paths:
--------------
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/MoveLayerablePlugIn.java
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/ValidateSelectedLayersPlugIn.java
core/trunk/src/org/openjump/core/ui/plugin/tools/TriangulationPlugIn.java
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/MoveLayerablePlugIn.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/MoveLayerablePlugIn.java
2018-06-04 17:25:25 UTC (rev 5834)
+++
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/MoveLayerablePlugIn.java
2018-06-04 19:28:48 UTC (rev 5835)
@@ -116,13 +116,13 @@
final WorkbenchContext workbenchContext) {
return super.createEnableCheck(workbenchContext).add(new EnableCheck()
{
public String check(JComponent component) {
- return
(index(selectedLayerable(workbenchContext.getLayerNamePanel())) == 0) ? I18N
+ return
(index(selectedLayerable(workbenchContext.getLayerableNamePanel())) == 0) ? I18N
.get("ui.plugin.MoveLayerablePlugIn.layer-is-already-at-the-top")
: null;
}
});
}
- };
+ }
public static class MoveLayerableDownPlugIn extends MoveLayerablePlugIn {
public static final Icon ICON = MoveLayerablePlugIn.DOWNICON;
@@ -139,11 +139,11 @@
final WorkbenchContext workbenchContext) {
return super.createEnableCheck(workbenchContext).add(new EnableCheck()
{
public String check(JComponent component) {
- return
(index(selectedLayerable(workbenchContext.getLayerNamePanel())) ==
(workbenchContext
+ return
(index(selectedLayerable(workbenchContext.getLayerableNamePanel())) ==
(workbenchContext
.getLayerViewPanel()
.getLayerManager()
.getCategory(
- selectedLayerable(workbenchContext.getLayerNamePanel()))
+
selectedLayerable(workbenchContext.getLayerableNamePanel()))
.getLayerables().size() - 1)) ? I18N
.get("ui.plugin.MoveLayerablePlugIn.layer-is-already-at-the-bottom")
: null;
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/ValidateSelectedLayersPlugIn.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/ValidateSelectedLayersPlugIn.java
2018-06-04 17:25:25 UTC (rev 5834)
+++
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/ValidateSelectedLayersPlugIn.java
2018-06-04 19:28:48 UTC (rev 5835)
@@ -115,10 +115,9 @@
public void initialize(PlugInContext context) throws Exception
{
- FeatureInstaller featureInstaller = new
FeatureInstaller(context.getWorkbenchContext());
- featureInstaller.addMainMenuItem(
- this,
//exe
- new String[] {MenuNames.TOOLS,
MenuNames.TOOLS_QA}, //menu path
+ FeatureInstaller.getInstance().addMainMenuPlugin(
+ this,
//exe
+ new String[] {MenuNames.TOOLS,
MenuNames.TOOLS_QA}, //menu path
this.getName() + "...", //name methode .getName recieved by
AbstractPlugIn
false, //checkbox
null, //icon
@@ -290,8 +289,7 @@
private Feature toFeature(ValidationError error, Layer sourceLayer,
Geometry geometry) {
Feature ringFeature = new BasicFeature(schema);
- ringFeature.setAttribute(SOURCE_FID,
- new Integer(error.getFeature().getID()));
+ ringFeature.setAttribute(SOURCE_FID, error.getFeature().getID());
ringFeature.setAttribute(ERROR, error.getMessage());
ringFeature.setGeometry(geometry);
Modified:
core/trunk/src/org/openjump/core/ui/plugin/tools/TriangulationPlugIn.java
===================================================================
--- core/trunk/src/org/openjump/core/ui/plugin/tools/TriangulationPlugIn.java
2018-06-04 17:25:25 UTC (rev 5834)
+++ core/trunk/src/org/openjump/core/ui/plugin/tools/TriangulationPlugIn.java
2018-06-04 19:28:48 UTC (rev 5835)
@@ -91,8 +91,7 @@
public void initialize(PlugInContext context) throws Exception {
- FeatureInstaller featureInstaller = new
FeatureInstaller(context.getWorkbenchContext());
- featureInstaller.addMainMenuPlugin(
+ FeatureInstaller.getInstance().addMainMenuPlugin(
this,
new String[] {MenuNames.TOOLS, MenuNames.TOOLS_GENERATE},
getName() + "...",
------------------------------------------------------------------------------
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
