Revision: 5097
http://sourceforge.net/p/jump-pilot/code/5097
Author: michaudm
Date: 2016-10-24 19:04:27 +0000 (Mon, 24 Oct 2016)
Log Message:
-----------
Clean some useless log message in ViewManager
Modified Paths:
--------------
plug-ins/ViewManagerPlugin/trunk/src/org/openjump/ext/viewmanager/StyledLayer.java
plug-ins/ViewManagerPlugin/trunk/src/org/openjump/ext/viewmanager/ViewManagerExtension.java
plug-ins/ViewManagerPlugin/trunk/src/org/openjump/ext/viewmanager/ViewManagerPlugIn.java
plug-ins/ViewManagerPlugin/trunk/src/org/openjump/ext/viewmanager/ViewSet.java
plug-ins/ViewManagerPlugin/trunk/src/org/openjump/ext/viewmanager/ViewSetPanel.java
plug-ins/ViewManagerPlugin/trunk/src/org/openjump/ext/viewmanager/style/PLabelStyle.java
plug-ins/ViewManagerPlugin/trunk/src/org/openjump/ext/viewmanager/style/PVertexStyle.java
Modified:
plug-ins/ViewManagerPlugin/trunk/src/org/openjump/ext/viewmanager/StyledLayer.java
===================================================================
---
plug-ins/ViewManagerPlugin/trunk/src/org/openjump/ext/viewmanager/StyledLayer.java
2016-10-24 19:02:25 UTC (rev 5096)
+++
plug-ins/ViewManagerPlugin/trunk/src/org/openjump/ext/viewmanager/StyledLayer.java
2016-10-24 19:04:27 UTC (rev 5097)
@@ -1,9 +1,6 @@
package org.openjump.ext.viewmanager;
-import com.vividsolutions.jump.workbench.model.Category;
-import com.vividsolutions.jump.workbench.model.Layer;
-import com.vividsolutions.jump.workbench.model.LayerManager;
-import com.vividsolutions.jump.workbench.model.Layerable;
+import com.vividsolutions.jump.workbench.model.*;
import com.vividsolutions.jump.workbench.ui.renderer.style.*;
import org.apache.log4j.Logger;
import org.openjump.ext.viewmanager.style.*;
@@ -156,31 +153,29 @@
layer.setEditable(editable);
if (styles != null) {
LOG.info("Nombre de styles enregistrés : " + styles.size());
- LOG.info("Styles : " + styles);
for (PStyle pstyle : styles) {
- LOG.info(" - transform " + pstyle + " to");
try {
Style newStyle = pstyle.getStyle(lyr);
- LOG.info(" - apply " +
newStyle.getClass().getSimpleName());
Style rm = layer.getStyle(newStyle.getClass());
if (rm != null) {
layer.removeStyle(rm);
} else if (BasicStyle.class.isInstance(newStyle)) {
layer.removeStyle(layer.getBasicStyle());
}
+ LOG.info(" - replace " +
newStyle.getClass().getSimpleName());
layer.addStyle(newStyle);
- //System.out.println(layer.getName() + ":" +
newStyle.getClass().getSimpleName() + " : " + newStyle.isEnabled());
} catch (Exception e) {
LOG.warn(pstyle, e);
}
}
}
+ layer.getLayerManager().fireLayerChanged(layer,
LayerEventType.APPEARANCE_CHANGED);
}
}
- boolean accept(String categoryFilter, String layerFilter, Category
category, Layerable layer) {
- Pattern categoryPattern = null;
- Pattern layerPattern = null;
+ private boolean accept(String categoryFilter, String layerFilter, Category
category, Layerable layer) {
+ Pattern categoryPattern = Pattern.compile(".*");
+ Pattern layerPattern = Pattern.compile(".*");
try {
categoryPattern = getPattern(categoryFilter);
layerPattern = getPattern(layerFilter);
Modified:
plug-ins/ViewManagerPlugin/trunk/src/org/openjump/ext/viewmanager/ViewManagerExtension.java
===================================================================
---
plug-ins/ViewManagerPlugin/trunk/src/org/openjump/ext/viewmanager/ViewManagerExtension.java
2016-10-24 19:02:25 UTC (rev 5096)
+++
plug-ins/ViewManagerPlugin/trunk/src/org/openjump/ext/viewmanager/ViewManagerExtension.java
2016-10-24 19:04:27 UTC (rev 5097)
@@ -14,7 +14,7 @@
}
public String getVersion() {
- return "0.3.3 (2016-10-12)";
+ return "0.3.4 (2016-10-24)";
}
public void configure(PlugInContext context) throws Exception {
Modified:
plug-ins/ViewManagerPlugin/trunk/src/org/openjump/ext/viewmanager/ViewManagerPlugIn.java
===================================================================
---
plug-ins/ViewManagerPlugin/trunk/src/org/openjump/ext/viewmanager/ViewManagerPlugIn.java
2016-10-24 19:02:25 UTC (rev 5096)
+++
plug-ins/ViewManagerPlugin/trunk/src/org/openjump/ext/viewmanager/ViewManagerPlugIn.java
2016-10-24 19:04:27 UTC (rev 5097)
@@ -134,7 +134,6 @@
saveViewSetAsButton.addActionListener(this);
toolBar.add(saveViewSetAsButton);
- //dialog.add(toolBar, BorderLayout.PAGE_START);
dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
dialog.add(toolBar, BorderLayout.NORTH);
@@ -213,11 +212,6 @@
return dialog;
}
- //FilenameFilter xmlFileFilter = new FilenameFilter() {
- // public boolean accept(File dir, String name) {
- // return name.toLowerCase().endsWith(".xml");
- // }
- //};
FileFilter xmlFileFilter = new FileFilter() {
public boolean accept(File file) {
@@ -326,14 +320,13 @@
public void saveViewSetAs() {
JFileChooser jfc = new JFileChooser(viewDir);
jfc.setDialogType(JFileChooser.SAVE_DIALOG);
- //jfc.setFileSelectionMode(JFileChooser.FILES_ONLY);
jfc.setFileFilter(xmlFileFilter);
int r = jfc.showSaveDialog(dialog);
if (r == JFileChooser.APPROVE_OPTION) {
File viewSetFile = jfc.getSelectedFile();
try {
if (currentViewSet == null) {
- System.out.println("No current view set");
+ context.getWorkbenchFrame().warnUser("No current view
set");
return;
}
currentViewSet.setName(viewSetFile.getName());
Modified:
plug-ins/ViewManagerPlugin/trunk/src/org/openjump/ext/viewmanager/ViewSet.java
===================================================================
---
plug-ins/ViewManagerPlugin/trunk/src/org/openjump/ext/viewmanager/ViewSet.java
2016-10-24 19:02:25 UTC (rev 5096)
+++
plug-ins/ViewManagerPlugin/trunk/src/org/openjump/ext/viewmanager/ViewSet.java
2016-10-24 19:04:27 UTC (rev 5097)
@@ -134,7 +134,7 @@
}
public static interface Listener {
- public void actionPerformed(ViewSet viewSet, int mod, View view);
+ void actionPerformed(ViewSet viewSet, int mod, View view);
}
}
Modified:
plug-ins/ViewManagerPlugin/trunk/src/org/openjump/ext/viewmanager/ViewSetPanel.java
===================================================================
---
plug-ins/ViewManagerPlugin/trunk/src/org/openjump/ext/viewmanager/ViewSetPanel.java
2016-10-24 19:02:25 UTC (rev 5096)
+++
plug-ins/ViewManagerPlugin/trunk/src/org/openjump/ext/viewmanager/ViewSetPanel.java
2016-10-24 19:04:27 UTC (rev 5097)
@@ -2,7 +2,6 @@
import com.vividsolutions.jump.I18N;
import com.vividsolutions.jump.workbench.plugin.PlugInContext;
-import org.apache.log4j.Logger;
import javax.swing.*;
import javax.swing.event.DocumentEvent;
@@ -26,10 +25,10 @@
*/
public class ViewSetPanel extends JPanel {
- I18N I18N_ = I18N.getInstance("view_manager");
+ private I18N I18N_ = I18N.getInstance("view_manager");
- ViewSet viewSet;
- PlugInContext context;
+ private ViewSet viewSet;
+ private PlugInContext context;
public ViewSetPanel(final PlugInContext context, final ViewSet viewSet) {
super(new GridBagLayout());
@@ -76,7 +75,7 @@
}
}
- class ViewPanel extends JPanel implements ActionListener {
+ private class ViewPanel extends JPanel implements ActionListener {
ImageIcon deleteIcon = new
ImageIcon(ViewSetPanel.class.getClassLoader().getResource("/images/delete.png"));
ImageIcon replaceIcon = new
ImageIcon(ViewSetPanel.class.getClassLoader().getResource("/images/replace.png"));
@@ -203,7 +202,6 @@
constraints.weightx = 0.0;
constraints.fill = GridBagConstraints.NONE;
- //constraints.anchor = GridBagConstraints.EAST;
constraints.gridx = 1;
add(applyButton, constraints);
constraints.gridx = 2;
Modified:
plug-ins/ViewManagerPlugin/trunk/src/org/openjump/ext/viewmanager/style/PLabelStyle.java
===================================================================
---
plug-ins/ViewManagerPlugin/trunk/src/org/openjump/ext/viewmanager/style/PLabelStyle.java
2016-10-24 19:02:25 UTC (rev 5096)
+++
plug-ins/ViewManagerPlugin/trunk/src/org/openjump/ext/viewmanager/style/PLabelStyle.java
2016-10-24 19:04:27 UTC (rev 5097)
@@ -83,7 +83,7 @@
public Style getStyle(Layerable layerable) {
LabelStyle labelStyle = new LabelStyle();
- LOG.info(" getLabelStyle");
+ //LOG.info(" getLabelStyle");
if (layerable instanceof Layer) {
labelStyle.initialize((Layer) layerable);
labelStyle.setEnabled(isEnabled());
@@ -93,7 +93,7 @@
labelStyle.setHideAtScale(hideAtScale);
labelStyle.setScaleToHideAt(maxScale);
- LOG.info(" getLabelStyle 1");
+ //LOG.info(" getLabelStyle 1");
int s = 0;
s += font.bold ? java.awt.Font.BOLD : 0;
@@ -103,7 +103,7 @@
labelStyle.setColor(ColorUtil.decode(font.color));
labelStyle.setHeightAttribute(font.heightAttribute);
- LOG.info(" getLabelStyle 2");
+ //LOG.info(" getLabelStyle 2");
if (outline != null) {
labelStyle.setOutlineShowing(outline.enabled);
@@ -111,7 +111,7 @@
labelStyle.setOutlineWidth(outline.width);
} else labelStyle.setOutlineShowing(false);
- LOG.info(" getLabelStyle 3");
+ //LOG.info(" getLabelStyle 3");
if (alignment != null) {
labelStyle.setHorizontalAlignment(alignment.horizontalAlignment.alignment);
@@ -120,11 +120,11 @@
labelStyle.setAngleAttribute(alignment.angleAttribute);
}
}
- LOG.info(labelStyle);
- LOG.info(" " + labelStyle.getAttribute());
- LOG.info(" " + labelStyle.isEnabled());
- LOG.info(" " + labelStyle.isScaling());
- LOG.info(" " + labelStyle.getHeight());
+ //LOG.info(labelStyle);
+ //LOG.info(" " + labelStyle.getAttribute());
+ //LOG.info(" " + labelStyle.isEnabled());
+ //LOG.info(" " + labelStyle.isScaling());
+ //LOG.info(" " + labelStyle.getHeight());
return labelStyle;
}
Modified:
plug-ins/ViewManagerPlugin/trunk/src/org/openjump/ext/viewmanager/style/PVertexStyle.java
===================================================================
---
plug-ins/ViewManagerPlugin/trunk/src/org/openjump/ext/viewmanager/style/PVertexStyle.java
2016-10-24 19:02:25 UTC (rev 5096)
+++
plug-ins/ViewManagerPlugin/trunk/src/org/openjump/ext/viewmanager/style/PVertexStyle.java
2016-10-24 19:04:27 UTC (rev 5097)
@@ -13,7 +13,7 @@
import java.awt.*;
/**
- * Created by UMichael on 13/06/2015.
+ * Persistent vertex style
*/
@XmlRootElement(name="vertexStyle")
public class PVertexStyle extends AbstractPStyle {
@@ -45,7 +45,6 @@
}
public Style getStyle(Layerable layerable) {
- //BasicStyle style = new BasicStyle();
VertexStyle vStyle;
if (shape.equals("Circle")) {
vStyle = new CircleVertexStyle();
@@ -68,12 +67,4 @@
return vStyle;
}
- //public Style getStyle(Layerable layerable) {
- // return new VertexStyle() {
- // @Override
- // public void setEnabled(boolean enabled) {
- // super.setEnabled(enabled);
- // }
- // };
- //}
}
------------------------------------------------------------------------------
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
