Revision: 4621
http://sourceforge.net/p/jump-pilot/code/4621
Author: michaudm
Date: 2015-12-13 23:09:23 +0000 (Sun, 13 Dec 2015)
Log Message:
-----------
Small fixes in ViewManagerPlugIn
Modified Paths:
--------------
plug-ins/ViewManagerPlugin/trunk/src/org/openjump/ext/viewmanager/StyledLayer.java
plug-ins/ViewManagerPlugin/trunk/src/org/openjump/ext/viewmanager/ViewSetPanel.java
Modified:
plug-ins/ViewManagerPlugin/trunk/src/org/openjump/ext/viewmanager/StyledLayer.java
===================================================================
---
plug-ins/ViewManagerPlugin/trunk/src/org/openjump/ext/viewmanager/StyledLayer.java
2015-12-13 21:58:21 UTC (rev 4620)
+++
plug-ins/ViewManagerPlugin/trunk/src/org/openjump/ext/viewmanager/StyledLayer.java
2015-12-13 23:09:23 UTC (rev 4621)
@@ -108,7 +108,7 @@
if (style.isEnabled()) {
PStyle basicStyle = getStyle(PBasicStyle.class);
if (basicStyle != null) {
- ((PBasicStyle)basicStyle).setEnabled(false);
+ basicStyle.setEnabled(false);
}
}
}
@@ -163,8 +163,13 @@
Style newStyle = pstyle.getStyle(lyr);
LOG.info(" - apply " +
newStyle.getClass().getSimpleName());
Style rm = layer.getStyle(newStyle.getClass());
- if (rm != null) layer.removeStyle(rm);
+ if (rm != null) {
+ layer.removeStyle(rm);
+ } else if (BasicStyle.class.isInstance(newStyle)) {
+ layer.removeStyle(layer.getBasicStyle());
+ }
layer.addStyle(newStyle);
+ //System.out.println(layer.getName() + ":" +
newStyle.getClass().getSimpleName() + " : " + newStyle.isEnabled());
} catch (Exception e) {
LOG.warn(pstyle, e);
}
Modified:
plug-ins/ViewManagerPlugin/trunk/src/org/openjump/ext/viewmanager/ViewSetPanel.java
===================================================================
---
plug-ins/ViewManagerPlugin/trunk/src/org/openjump/ext/viewmanager/ViewSetPanel.java
2015-12-13 21:58:21 UTC (rev 4620)
+++
plug-ins/ViewManagerPlugin/trunk/src/org/openjump/ext/viewmanager/ViewSetPanel.java
2015-12-13 23:09:23 UTC (rev 4621)
@@ -14,7 +14,15 @@
import java.awt.event.MouseEvent;
/**
- * Created by UMichael on 14/06/2015.
+ * A JPanel containing all the elements to manage a viewSet
+ * <ul>
+ * <li>add a new view to the viewSet</li>
+ * <li>rename a view</li>
+ * <li>remove a view from a viewSet</li>
+ * <li>apply the view to current viewPanel</li>
+ * <li>replace a view</li>
+ * <li>move a viewup or down in the view list</li>
+ * </ul>
*/
public class ViewSetPanel extends JPanel {
@@ -54,6 +62,7 @@
private void init(PlugInContext context, ViewSet viewSet) {
this.viewSet = viewSet;
+ removeAll();
GridBagConstraints constraints = new GridBagConstraints();
constraints.weightx = 1.0;
constraints.insets = new Insets(2,2,2,2);
------------------------------------------------------------------------------
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
