/ - Diff - Application: gvSIG desktop - gvSIG

     	};
     	private TreeMap<Class<?>, ILabelingStrategyPanel> strategyPanels =
     			new TreeMap<Class<?>, ILabelingStrategyPanel>(comparator);
     	private JCheckBox chkApplyLabels;
     	private ILabelable layer;
     	private JPanel content;
-...
+    		}
+    	}
     	 @Override
     	    public int getPriority() {
     	    	return 600;
-...
     	private void initialize() {
     		setLayout(new BorderLayout());
                     SymbologySwingManager symbologySwingManager = SymbologySwingLocator.getSwingManager();
                     Iterator<ILabelingStrategyPanel> it = symbologySwingManager.getLabelingEditors().iterator();
                     while( it.hasNext() ) {
                         ILabelingStrategyPanel pnl = it.next();
-...
+    	}
             /**
+             *
+             *
              * @deprecated use {#SymbolSwingManger.
              */
     	public static void addLabelingStrategy(Class<? extends ILabelingStrategyPanel> iLabelingStrategyPanelClass) {
-...
+    	}
     	public void acceptAction() {
     	    applyAction();
+    	}
     	public void cancelAction() {

     import org.gvsig.fmap.mapcontext.rendering.legend.styling.ILabelingMethod;
     /**
      * @author gvSIG Team
+     *
      */
     public abstract class AbstractLabelingMethodPanel extends JPanel implements PropertyChangeListener {
     	public static final String PLACEMENT_CONSTRAINTS = "PLACEMENT_CONSTRAINTS";
     	/**
+         *
          */
         private static final long serialVersionUID = 3042343486793818865L;
         /**
+         *
          */
         public static final String PLACEMENT_CONSTRAINTS = "PLACEMENT_CONSTRAINTS";
     	/**
+    	 *
     	 */
     	public static final String ALLOW_OVERLAP = "ALLOW_OVERLAP";
     	/**
+    	 *
     	 */
     	public static final String ZOOM_CONSTRAINTS= "ZOOM_CONSTRAINTS";
     	protected FLyrVect layer;
     	protected ILabelingMethod method;
     	public abstract String getName();
     	/**
     	 * @return the labeling method class.
     	 */
     	public abstract Class<? extends ILabelingMethod> getLabelingMethodClass();
     	/**
     	 * @param method
     	 * @param srcLayer
     	 * @throws ReadException
     	 */
     	public void setModel(ILabelingMethod method, FLyrVect srcLayer)
     			throws ReadException {
     		if (srcLayer == null) {
     			throw new ReadException("FLyrVect is null",
     					new Exception("FLyrVect is null"));
-...
     		this.layer = srcLayer;
     		try {
     			if (method!= null && method.getClass().equals(getLabelingMethodClass())) {
     			Class<? extends ILabelingMethod> labelingMethodClass = getLabelingMethodClass();
                 if (method!= null && method.getClass().equals(labelingMethodClass)) {
     				this.method = method;
     			} else {
     				this.method = getLabelingMethodClass().newInstance();
     				this.method = labelingMethodClass.newInstance();
+    			}
     			initializePanel();
     		} catch (Exception e) {
     			throw new ReadException(
     					srcLayer.getFeatureStore().getName(),
     					new Exception("Unable to load labeling method. Is it in your classpath?", e));
     					srcLayer.getFeatureStore().getName(),
     					new Exception("Unable to load labeling method. Is it in your classpath?", e));
+    		}
     		initializePanel();
     		try {
     			fillPanel(this.method, srcLayer.getFeatureStore().getDefaultFeatureType());
     			fillPanel(srcLayer.getFeatureStore().getDefaultFeatureType());
     		} catch (DataException de) {
     			throw new ReadException(srcLayer.getFeatureStore().getName(), de);
+    		}
+    	}
     	protected abstract void initializePanel() ;
     	/**
     	 * @param ftype
     	 * @throws ReadException
     	 */
     	public abstract void fillPanel(
     			ILabelingMethod method,
     			FeatureType ftype) throws ReadException;
     	public String toString() {
     		return getName();
+    	}
     	/**
     	 * @return the labeling method
     	 */
     	public ILabelingMethod getMethod() {
     		return method;
     		return method;
+    	}
     	public boolean equals(Object obj) {
     		if (obj == null) return false;
     		return getClass().equals(obj.getClass());

     import javax.swing.JPanel;
     import javax.swing.JSplitPane;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
     import org.gvsig.andami.messages.NotificationManager;
     import org.gvsig.app.ApplicationLocator;
     import org.gvsig.fmap.dal.exception.DataException;
     import org.gvsig.fmap.dal.exception.ReadException;
     import org.gvsig.fmap.dal.feature.Feature;
     import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
     import org.gvsig.fmap.dal.feature.FeatureSelection;
     import org.gvsig.fmap.dal.feature.FeatureSet;
     import org.gvsig.fmap.dal.feature.FeatureStore;
     import org.gvsig.fmap.dal.feature.FeatureType;
     import org.gvsig.fmap.mapcontext.rendering.legend.styling.ILabelClass;
     import org.gvsig.fmap.mapcontext.rendering.legend.styling.ILabelingMethod;
-...
     import org.gvsig.labeling.lang.LabelClassUtils;
     import org.gvsig.symbology.SymbologyLocator;
     import org.gvsig.symbology.fmap.mapcontext.rendering.legend.styling.DefaultLabelingMethod;
     import org.gvsig.tools.dispose.DisposableIterator;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
     public class DefaultLabeling extends AbstractLabelingMethodPanel implements
     		ActionListener {
-...
     	private IZoomConstraints zoomConstraints;
     	private LabelClassProperties lcProp;
         private JSplitPane scrl;
         private JPanel aux;
         private JPanel aux2;
     	public Class<? extends ILabelingMethod> getLabelingMethodClass() {
     		return DefaultLabelingMethod.class;
+    	}
-...
+    	}
     	@Override
     	public void fillPanel(ILabelingMethod method, FeatureType fty) {
     	public void fillPanel(FeatureType fty) {
     		try {
     			if (enableLayerPrev.isSelected()) {
     			if (getEnableLayerPreview().isSelected()) {
     				layerPrev.setLayer(layer);
     			} else {
     				layerPrev.setLayer(null);
-...
+    	}
     	@Override
     	protected void initializePanel() {
     		setLayout(new BorderLayout());
     		JSplitPane scrl = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT);
     		scrl.add(getLayerPreview(), JSplitPane.LEFT);
         protected void initializePanel() {
             setLayout(new BorderLayout());
             add(getScrl(), BorderLayout.CENTER);
             scrl.setDividerLocation(500);
             getEnableLayerPreview().setSelected(false);
             add(getEnableLayerPreview(), BorderLayout.SOUTH);
+        }
     		labelPrev = getLabelPrev(); // new LabelClassPreview();
     		JPanel aux = new JPanel(new BorderLayout());
     		aux.add(new JBlank(10, 10), BorderLayout.NORTH);
     		aux.add(new JBlank(10, 10), BorderLayout.WEST);
     		aux.add(labelPrev, BorderLayout.CENTER);
     		aux.add(new JBlank(10, 10), BorderLayout.EAST);
     		JPanel aux2 = new JPanel(new FlowLayout(FlowLayout.RIGHT, 10, 10));
     		btnProperties = getBtnProperties();
     		aux2.add(btnProperties);
     		aux.add(aux2, BorderLayout.SOUTH);
     		scrl.add(aux, JSplitPane.RIGHT);
     		add(scrl, BorderLayout.CENTER);
     		scrl.setDividerLocation(500);
         private JSplitPane getScrl() {
             if (scrl == null) {
                 scrl = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT);
+            }
             scrl.add(getLayerPreview(), JSplitPane.LEFT);
             scrl.add(getAuxPanel(), JSplitPane.RIGHT);
             add(scrl, BorderLayout.CENTER);
             return scrl;
+        }
     		getEnableLayerPreview().setSelected(false);
     		add(enableLayerPrev, BorderLayout.SOUTH);
     	JPanel getAuxPanel(){
     	    if(aux == null){
                 aux = new JPanel(new BorderLayout());
                 aux.add(new JBlank(10, 10), BorderLayout.NORTH);
                 aux.add(new JBlank(10, 10), BorderLayout.WEST);
                 aux.add(getLabelPrev(), BorderLayout.CENTER);
                 aux.add(new JBlank(10, 10), BorderLayout.EAST);
                 aux.add(getAux2Panel(), BorderLayout.SOUTH);
+    	    }
     	    return aux;
+    	}
     	JPanel getAux2Panel(){
             if(aux2 == null){
                 aux2 = new JPanel(new FlowLayout(FlowLayout.RIGHT, 10, 10));
                 aux2.add(getBtnProperties());
+            }
             return aux2;
+        }
     	private LabelClassProperties getLcProp() {
     		if (lcProp == null) {

     public class FeatureDependent extends AbstractLabelingMethodPanel implements ActionListener{
             private static final Logger logger = LoggerFactory.getLogger(FeatureDependent.class);
     	private static final long serialVersionUID = 5493451803343695650L;
     	private static int NAME_FIELD_INDEX = 0;
     	private static int PREVIEW_FIELD_INDEX = 1;
-...
     	private boolean openEditor = false;
     	private JButton btnMoveDownClass;
     	private JButton btnDelClass;
         private JPanel panel;
     	/*
     	private String[] fieldNames;
     	private int[] fieldTypes;
-...
     	@Override
     	public String getName() {
     		return Messages.getText(
     				"define_classes_of_features_and_label_each_differently")+".";
+    	}
-...
     	private class LabelClassTableModel extends DefaultTableModel {
     		private static final long serialVersionUID = -9152998982339430209L;
     		Object[][] values;
-...
     	@Override
     	protected void initializePanel() {
     			setLayout(new BorderLayout());
     			JPanel panel = new JPanel(new BorderLayout());
     			GridLayout gl = new GridLayout(4,1);
     			buttonPanel = new JPanel(gl);
     			buttonPanel.add(getBtnAddClass());
     			buttonPanel.add(getBtnDelClass());
     			// buttonPanel.addComponent(new JBlank(10, 10));
     			buttonPanel.add(getBtnMoveUpClass());
     			buttonPanel.add(getBtnMoveDownClass());
     			JPanel auxp = new JPanel();
     			auxp.add(buttonPanel);
     			panel.add(auxp, BorderLayout.EAST);
     			panel.add(getChkDefinePriorities(), BorderLayout.NORTH);
                             JPanel centro = new JPanel(new BorderLayout());
                             centro.add(getLabelClassSelector(), BorderLayout.NORTH);
                             centro.add(getCenterScrl(), BorderLayout.CENTER);
     			panel.add(centro, BorderLayout.CENTER);
     			add(panel,BorderLayout.CENTER);
     			add(getPanel(),BorderLayout.CENTER);
+    		}
         private JPanel getPanel() {
             if (this.panel == null) {
                 this.panel = new JPanel(new BorderLayout());
                 GridLayout gl = new GridLayout(4, 1);
                 buttonPanel = new JPanel(gl);
                 buttonPanel.add(getBtnAddClass());
                 buttonPanel.add(getBtnDelClass());
                 // buttonPanel.addComponent(new JBlank(10, 10));
                 buttonPanel.add(getBtnMoveUpClass());
                 buttonPanel.add(getBtnMoveDownClass());
                 JPanel auxp = new JPanel();
                 auxp.add(buttonPanel);
                 this.panel.add(auxp, BorderLayout.EAST);
                 this.panel.add(getChkDefinePriorities(), BorderLayout.NORTH);
                 JPanel centro = new JPanel(new BorderLayout());
                 centro.add(getLabelClassSelector(), BorderLayout.NORTH);
                 centro.add(getCenterScrl(), BorderLayout.CENTER);
                 panel.add(centro, BorderLayout.CENTER);
+            }
             return this.panel;
+        }
             private JPanel getLabelClassSelector() {
                 I18nManager i18nManager = ToolsLocator.getI18nManager();
                 SymbologyManager symbologyMamanger = SymbologyLocator.getSymbologyManager();
                 JPanel panel = new JPanel(new BorderLayout());
                 panel.add(new JLabel(i18nManager.getTranslation("_Label_type_to_use_XcolonX")), BorderLayout.WEST);
                 DefaultComboBoxModel model = new DefaultComboBoxModel();
                 Collection<ILabelClassFactory> factories = symbologyMamanger.getLabelClassFactories();
                 for( ILabelClassFactory factory : factories ) {
-...
+                }
                 return panel;
+            }
     	public void fillPanel(ILabelingMethod method, FeatureType fty)
     	public void fillPanel(FeatureType fty)
     	throws ReadException {
     		if (method == null) {
     			this.method = new FeatureDependentLabeled();
+    		}
     		chkDefinePriorities.setSelected(this.method.definesPriorities());
     		repaint();
+    	}
-...
+                }
                 repaint();
+            }
     	public void propertyChange(PropertyChangeEvent evt) {
     		// TODO Auto-generated method stub

     import org.gvsig.fmap.mapcontext.rendering.legend.styling.ILabelingMethod;
     import org.gvsig.i18n.Messages;
     import org.gvsig.labeling.label.OnSelectionLabeled;
     import org.gvsig.symbology.SymbologyLocator;
     /**
      * @author gvSIG Team
+     *
      */
     public class OnSelection extends DefaultLabeling{
     	private static final long serialVersionUID = -3619706540747109386L;
-...
     		return OnSelectionLabeled.class;
+    	}
     	@Override
     	public ILabelingMethod getMethod() {
     		OnSelectionLabeled resp = null;
     		if (super.getMethod() instanceof OnSelectionLabeled) {
     			resp = (OnSelectionLabeled) super.getMethod();
     		} else {
     			resp = new OnSelectionLabeled();
+    		}
     		if (resp.getLabelClasses() == null || resp.getLabelClasses().length == 0) {
     			ILabelClass lc = null;
     			lc = SymbologyLocator.getSymbologyManager().createDefaultLabel();
     			resp.addLabelClass(lc);
+    		}
     		return resp;
+    	}
     	protected ILabelingMethod newMethodForThePreview(ILabelClass defaultLabel) {
     		OnSelectionLabeled method = new OnSelectionLabeled();
     		method.addLabelClass(defaultLabel);

     import javax.swing.JLabel;
     import javax.swing.JPanel;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
     import org.gvsig.andami.messages.NotificationManager;
     import org.gvsig.app.ApplicationLocator;
     import org.gvsig.app.project.documents.view.legend.gui.ILabelingStrategyPanel;
     import org.gvsig.fmap.dal.exception.ReadException;
     import org.gvsig.fmap.dal.feature.FeatureStore;
     import org.gvsig.fmap.mapcontext.MapContextLocator;
     import org.gvsig.fmap.mapcontext.layers.FLayer;
     import org.gvsig.fmap.mapcontext.layers.vectorial.FLyrVect;
     import org.gvsig.fmap.mapcontext.rendering.legend.IVectorLegend;
-...
     import org.gvsig.labeling.lang.LabelClassUtils;
     import org.gvsig.symbology.SymbologyLocator;
     /**
      * @author gvSIG Team
+     *
      */
     public class GeneralLabeling extends JPanel implements
     ILabelingStrategyPanel, ActionListener {
     	private static final long serialVersionUID = 8864709758980903351L;
     	private static Comparator comparator =
     	   private static final Logger logger = LoggerFactory
                .getLogger(GeneralLabeling.class);
     	private static Comparator<Class<? extends ILabelingMethod>> comparator =
     			new Comparator<Class<? extends ILabelingMethod>>(){
     		public int compare(Class<? extends ILabelingMethod> o1,
     				Class<? extends ILabelingMethod> o2) {
     			return o1.getName().compareTo(o2.getName());
     		}};
     	private static TreeMap<
     			Class<? extends ILabelingMethod>,
     			Class<? extends AbstractLabelingMethodPanel>
-...
     			Class<? extends ILabelingMethod>,
     			Class<? extends AbstractLabelingMethodPanel>
     		>(comparator);
     	private JButton btnVisualization;
     	private JButton btnPlacement;
     	private JComboBox cmbMethod;
     	private JComboBox<?> cmbMethod;
     	private JPanel methodPanel;
     	private IPlacementConstraints placementConstraints;
     	private IZoomConstraints zoomConstraints;
-...
     	private JCheckBox chkAllowLabelOverlapping;
     	private FLyrVect auxLayer;
     	private GeneralLabelingStrategy gStr;
     	private AbstractLabelingMethodPanel previousMethodPanel = null;
     	/**
+    	 *
     	 */
     	public GeneralLabeling() {
     		initialize();
+    	}
     	private void initialize() {
     		setLayout(new BorderLayout());
     		JPanel center = new JPanel(new BorderLayout(10, 10));
     		center.setBorder(BorderFactory.createTitledBorder(
-...
     		return btnPlacement;
+    	}
     	private JComboBox getCmbMethod() {
     	@SuppressWarnings({ "rawtypes", "unchecked" })
         private JComboBox getCmbMethod() {
     		if (cmbMethod == null) {
     			Iterator<Class<? extends AbstractLabelingMethodPanel>> it = methods.values().iterator();
     			ArrayList<AbstractLabelingMethodPanel> panels = new ArrayList<AbstractLabelingMethodPanel>();
-...
     		return resp;
+    	}
     	public void setModel(FLayer layer, ILabelingStrategy str) {
     		if (layer instanceof FLyrVect) {
     			try {
     				targetLayer = (FLyrVect) layer;//.cloneLayer();
     				auxLayer = (FLyrVect) targetLayer.cloneLayer();
     				auxLayer.setParentLayer(layer.getParentLayer());
     				auxLayer.setLegend((IVectorLegend)targetLayer.getLegend());
     				auxLayer.setProjection(targetLayer.getProjection());
     				if (str instanceof GeneralLabelingStrategy) {
     					GeneralLabelingStrategy gls = (GeneralLabelingStrategy) str;
     					GeneralLabelingStrategy gls = (GeneralLabelingStrategy) str;
     					gStr = (GeneralLabelingStrategy) gls.clone();
     					auxLayer.setLabelingStrategy(gStr);
     					gStr.setLayer(auxLayer);
-...
+    	}
     	/**
     	 * @param iLabelingMethodClass
     	 */
     	public static void addLabelingMethod(Class<? extends AbstractLabelingMethodPanel> iLabelingMethodClass) {
     		try {
     			methods.put(
-...
     		if (zoomConstraints == null) {
     			zoomConstraints =
     					SymbologyLocator.getSymbologyManager().createDefaultZoomConstraints();
+    		}
     		return zoomConstraints;
+    	}
-...
     				IPlacementProperties pp = PlacementProperties.createPlacementProperties(
     						getPlacementConstraints(),
     						((FLyrVect) auxLayer).getShapeType());
     				ApplicationLocator.getManager().getUIManager().addWindow(pp);
     				placementConstraints = pp.getPlacementConstraints();
     				((AbstractLabelingMethodPanel) cmbMethod.getSelectedItem()).
-...
     					!newValue,
     					newValue));
     		} else if (c.equals(cmbMethod)) {
     			AbstractLabelingMethodPanel p = (AbstractLabelingMethodPanel) cmbMethod.getSelectedItem();
     			if(previousMethodPanel == null || previousMethodPanel != p ){
     				Container cont = methodPanel.getParent();
     				cont.remove(methodPanel);
     				emptyContainer(methodPanel);
             } else if (c.equals(getCmbMethod())) {
                 AbstractLabelingMethodPanel p = (AbstractLabelingMethodPanel) cmbMethod.getSelectedItem();
                 Container cont = methodPanel.getParent();
                 cont.remove(methodPanel);
                 emptyContainer(methodPanel);
     				try {
     					if(gStr != null){
     						if(gStr.getLabelingMethod() != null){
     							p.setModel(gStr.getLabelingMethod(), auxLayer);
+    						}
     					} else {
     						p.setModel(getMethod(),auxLayer);
+    					}
     					methodPanel.add(
     							p,
     							BorderLayout.CENTER);
                 try {
                     if (gStr != null) {
                         if (gStr.getLabelingMethod() != null) {
                             p.setModel(gStr.getLabelingMethod(), auxLayer);
+                        }
                     } else {
                         p.setModel(getMethod(), auxLayer);
+                    }
                     methodPanel.add(p, BorderLayout.CENTER);
     					methodPanel.repaint();
     					setVisible(false);
     					setVisible(true);
     				} catch (Exception e1) {
     					NotificationManager.addError(new Date(System.currentTimeMillis()).toString(), e1);
+    				}
     				cont.add(methodPanel, BorderLayout.CENTER);
+    			}
     			previousMethodPanel = p;
+    		}
+    	}
                     methodPanel.repaint();
                     setVisible(false);
                     setVisible(true);
                 } catch (Exception e1) {
                     NotificationManager.addError(new Date(System.currentTimeMillis()).toString(), e1);
+                }
                 cont.add(methodPanel, BorderLayout.CENTER);
+            }
     	private void emptyContainer(Container c) {
     		for (int i = 0; i < c.getComponentCount(); i++) {
     			if (c.getComponent(i) instanceof Container) {
     				emptyContainer((Container) c.getComponent(i));
+    			}
     			c.remove(i);
+    		}
+    	}
         private void emptyContainer(Container c) {
             for (int i = 0; i < c.getComponentCount(); i++) {
                 c.remove(i);
+            }
+        }
     	public String getLabelingStrategyName() {
     		return Messages.getText("user_defined_labels");
+    	}

Application: gvSIG desktop

Revision 42981