/ - Diff - Application: gvSIG desktop - gvSIG

Revision 24619

     import java.awt.BorderLayout;
     import java.awt.Dimension;
     import java.awt.Window;
     import java.awt.event.ActionEvent;
     import java.awt.event.ActionListener;
     import java.util.List;
-...
     import org.gvsig.gui.beans.AcceptCancelPanel;
     import org.gvsig.gui.beans.swing.GridBagLayoutPanel;
     import org.gvsig.gui.beans.swing.JButton;
     import org.gvsig.topology.ITopologyRule;
     import org.gvsig.topology.ITopologyStatus;
     import org.gvsig.topology.Topology;
-...
     	private static final long serialVersionUID = 4607286708592192479L;
     	private Topology workingTopology;
     //	private Topology workingTopology;
     	private Topology originalTopology;
     	private JTabbedPane        jTabbedPane    = null;
-...
     	private TopologyRulesPanel rulesTabPanel = null;
     	private TopologyErrorPanel errorPanel   =  null;
     	private AcceptCancelPanel  acceptCancelPanel = null;
     	private JPanel  acceptPanel = null;
     	private boolean            accepted       = false;
     	private boolean readOnly = true;
     	/**
     	 * Constructor. It receives the topology whose properties we are going to
     	 * show in a tabbed panel.
+    	 *
     	 * @param topology
     	 */
     	public TopologyPropertiesPanel(Topology topology){
     		this.originalTopology = topology;
     		this.workingTopology = (Topology) topology.clone();
     		this.originalTopology = topology;
     		initialize();
+    	}
-...
     		this.setSize(523, 385);
     		this.setPreferredSize(new Dimension(523, 385));
     		this.add(getJTabbedPane(), BorderLayout.CENTER);
     		if(readOnly){
     			this.add(getAcceptPanel(),BorderLayout.SOUTH);
     		}else{
     			this.add(getAcceptCancelPanel(), BorderLayout.SOUTH);
+    		}
     		this.add(getAcceptCancelPanel(), BorderLayout.SOUTH);
     		final TopologyContentProvider contentProvider =
     				new TopologyContentProvider(workingTopology);
     				new TopologyContentProvider(originalTopology);
     		//General tab
     		generalTab = new GeneralTabPanel();
     		generalTab = new GeneralTabPanel(readOnly);
     		getJTabbedPane().addTab(PluginServices.getText(this, "General"), generalTab);
     		//Layers tab
     		lyrsPanel = new LayerSelectionPanel(workingTopology.getLayers(), workingTopology.getMapContext());
     		lyrsPanel = new LayerSelectionPanel(originalTopology.getLayers(),
     											originalTopology.getMapContext(), readOnly);
     		//if panel is read only, we should delete this
     		/*
     		lyrsPanel.addLayerSelectionListener(new LayerSelectionListener(){
     			public void selectionEvent(SelectedLayerEvent event) {
     				FLyrVect eventLyr = (FLyrVect) event.lyrOfEvent;
     				String warningMessage = "";
     				String title = "";
     				if(event.eventType == SelectedLayerEvent.REMOVED_EVENT_TYPE){
     					List<ITopologyRule> rulesToRemove = workingTopology.getRulesByLyr(eventLyr);
     					List<ITopologyRule> rulesToRemove = originalTopology.getRulesByLyr(eventLyr);
     					if(rulesToRemove.size() > 0){
     						warningMessage += PluginServices.getText(this, "Remove_Lyr_WARNING1");
-...
     													title);
     					if(deleteLyr)
     						workingTopology.removeLayer(eventLyr);
     						originalTopology.removeLayer(eventLyr);
     				}else if(event.eventType == SelectedLayerEvent.ADDED_EVENT_TYPE){
     					boolean addLyr = true;
     					if(workingTopology.getStatus() == ITopologyStatus.VALIDATED_WITH_ERRORS){
     					if(originalTopology.getStatus() == ITopologyStatus.VALIDATED_WITH_ERRORS){
     						warningMessage = PluginServices.getText(this, "AddLyrDeleteErrors_WARNING");
     						title = PluginServices.getText(this, "warning");
     						addLyr = GUIUtil.getInstance().optionMessage(warningMessage, title);
+    					}
     					if(addLyr){
     						workingTopology.addLayer(eventLyr);
     						originalTopology.addLayer(eventLyr);
     						errorPanel.updateErrorTable();
+    					}
+    				}
-...
     				generalTab.updateContent();
     				rulesTabPanel.updateContent(contentProvider);
     			}});
     		*/
     		getJTabbedPane().addTab(PluginServices.getText(this, "Layers"), lyrsPanel);
     		//Rules tab
     		rulesTabPanel = new TopologyRulesPanel(null, contentProvider);
     		rulesTabPanel = new TopologyRulesPanel(null, contentProvider, readOnly);
     		/*
     		rulesTabPanel.addRuleSelectionListener(new RuleSelectionListener(){
     			public void selectionEvent(SelectedRuleEvent event) {
     				ITopologyRule eventRule = event.getRule();
     				if(event.getEventType() == SelectedRuleEvent.RULE_REMOVED){
     					workingTopology.removeRule(eventRule);
     					originalTopology.removeRule(eventRule);
     					generalTab.updateContent();
     					rulesTabPanel.updateContent(contentProvider);
-...
     			public void selectionEvent(SelectedRuleEvent event) {
     				generalTab.updateContent();
     			}});
     		*/
     		getJTabbedPane().addTab(PluginServices.getText(this, "Rules"), rulesTabPanel);
     		//Topology errors tab
     		errorPanel = new TopologyErrorPanel(workingTopology.getErrorContainer());
     		errorPanel = new TopologyErrorPanel(originalTopology.getErrorContainer());
     		getJTabbedPane().addTab(PluginServices.getText(this, "Errors"), errorPanel);
+    	}
-...
     			jTabbedPane.addChangeListener(new ChangeListener() {
     				public void stateChanged(ChangeEvent e) {
     					JTabbedPane tabs = (JTabbedPane) e.getSource();
     					getAcceptCancelPanel().setOkButtonEnabled(!(tabs.getSelectedComponent() instanceof WizardPanel));
     					if(acceptPanel instanceof AcceptCancelPanel){
     						((AcceptCancelPanel)acceptPanel).
     							setOkButtonEnabled(!(tabs.getSelectedComponent() instanceof WizardPanel));
+    					}
+    				}
     			});
+    		}
     		return jTabbedPane;
+    	}
     	private AcceptCancelPanel getAcceptCancelPanel(){
     		if (acceptCancelPanel == null) {
     //	JPanel southPanel = new JPanel();
     //	JButton okButton = new JButton(PluginServices.getText(this, "OK"));
     //
     //	okButton.addActionListener(new ActionListener() {
     //		public void actionPerformed(ActionEvent arg0) {
     //			Window parentWindow = GUIUtil.getInstance().getParentWindow(
     //					panel);
     //			parentWindow.setVisible(false);
     //			parentWindow.dispose();
     //			panel.setOkPressed(true);
     //		}
     //	});
     //
     //	southPanel.setLayout(new BorderLayout());
     //	JPanel aux = new JPanel();
     //	aux.add(okButton, BorderLayout.EAST);
     //	southPanel.add(aux, BorderLayout.EAST);
     //	panel.add(southPanel, BorderLayout.SOUTH);
     	private JPanel getAcceptPanel(){
     		if(acceptPanel == null){
     			acceptPanel = new JPanel();
     			JButton okButton = new JButton(PluginServices.getText(this, "OK"));
     			okButton.addActionListener(new ActionListener() {
     				public void actionPerformed(ActionEvent arg0) {
     					if (PluginServices.getMainFrame() != null) {
     						PluginServices.getMDIManager().closeWindow((IWindow) TopologyPropertiesPanel.this);
     					} else {
     						((JDialog) (getParent().getParent().getParent().getParent())).dispose();
+    					}
+    				}
     			});
     			acceptPanel.setLayout(new BorderLayout());
     			JPanel aux = new JPanel();
     			aux.add(okButton, BorderLayout.EAST);
     			acceptPanel.add(aux, BorderLayout.EAST);
+    		}
     		return acceptPanel;
+    	}
     	private JPanel getAcceptCancelPanel(){
     		if (acceptPanel == null) {
     			ActionListener okAction = new ActionListener() {
     				public void actionPerformed(ActionEvent e) {
     					accepted = true;
-...
+    					}
+    				}
     			};
     			acceptCancelPanel = new AcceptCancelPanel(okAction, cancelAction);
     			acceptPanel = new AcceptCancelPanel(okAction, cancelAction);
+    		}
     		return acceptCancelPanel;
     		return acceptPanel;
+    	}
     	public boolean isAccepted() {
-...
     				return;
+    			}
     			workingTopology.setName(topologyName);
     			originalTopology.setName(topologyName);
     			//Meter aqu? un mensaje que avise de que si se cambia la tolerancia de cluster se va a resetear
     			//el estado y los errores topologicos
     			workingTopology.setClusterTolerance(clusterTolerance);
     			workingTopology.setMaxNumberOfErrors(maxNumberOfErrors);
     			originalTopology.setClusterTolerance(clusterTolerance);
     			originalTopology.setMaxNumberOfErrors(maxNumberOfErrors);
     		}//general tab
     		try {
     			Topology.copyProperties(workingTopology, originalTopology);
     		} catch (Exception e) {
     			// TODO Auto-generated catch block
     			e.printStackTrace();
+    		}
     //		try {
     //			Topology.copyProperties(workingTopology, originalTopology);
     //		} catch (Exception e) {
     //			// TODO Auto-generated catch block
     //			e.printStackTrace();
     //		}
             GUIUtil.getInstance().updateTopologyInToc(originalTopology.getMapContext(), originalTopology);
-...
     		JLabel nLyrsLabel;
     		JLabel nRulesLabel;
     		boolean readOnly = false;
     		boolean changed = false;
     		public GeneralTabPanel(){
     		public GeneralTabPanel(boolean readOnly){
     			super();
     			this.readOnly = readOnly;
     			initialize();
+    		}
-...
     			JPanel firstPanel = new JPanel();
     			firstPanel.setLayout(new BoxLayout(firstPanel, BoxLayout.X_AXIS));
     			firstPanel.add(Box.createHorizontalStrut(15));
     			String topologyName = workingTopology.getName();
     			String topologyName = originalTopology.getName();
     			firstPanel.add(new JLabel(PluginServices.getText(this, "topology_name")));
     			firstPanel.add(Box.createHorizontalStrut(5));
     			nameTextField = new JTextField(topologyName, 20);
     			ChangeDocumentListener changeListener = new ChangeDocumentListener();
     			nameTextField.getDocument().addDocumentListener(changeListener);
     			firstPanel.add(nameTextField);
     			firstPanel.setPreferredSize(new Dimension(500, 20));
     			firstPanel.setMinimumSize(new Dimension(500, 20));
-...
     			JPanel secondPanel = new JPanel();
     			secondPanel.setLayout(new BoxLayout(secondPanel, BoxLayout.X_AXIS));
     			secondPanel.add(Box.createHorizontalStrut(15));
     			double clusterTolerance = workingTopology.getClusterTolerance();
     			double clusterTolerance = originalTopology.getClusterTolerance();
     			secondPanel.add(new JLabel(PluginServices.getText(this, "cluster_tolerance")));
     			secondPanel.add(Box.createHorizontalStrut(5));
     			clusterTextField = new JTextField(Double.toString(clusterTolerance), 20);
     			secondPanel.add(clusterTextField);
     			clusterTextField.getDocument().addDocumentListener(changeListener);
     			secondPanel.setPreferredSize(new Dimension(500, 20));
     			secondPanel.setMinimumSize(new Dimension(500, 20));
     			secondPanel.setMaximumSize(new Dimension(500, 20));
-...
     			add(Box.createVerticalStrut(10));
     			JPanel fourthPanel = new JPanel();
     			int maxNumberOfErrors = workingTopology.getMaxNumberOfErrors();
     			int maxNumberOfErrors = originalTopology.getMaxNumberOfErrors();
     			fourthPanel.setLayout(new BoxLayout(fourthPanel, BoxLayout.X_AXIS));
     			fourthPanel.add(Box.createHorizontalStrut(15));
     			fourthPanel.add(new JLabel(PluginServices.getText(this, "max_number_of_errors")));
     			fourthPanel.add(Box.createHorizontalStrut(5));
     			maxNumberOfErrorsTextField = new JTextField(Integer.toString(maxNumberOfErrors), 20);
     			clusterTextField.getDocument().addDocumentListener(changeListener);
     			fourthPanel.add(maxNumberOfErrorsTextField);
     			fourthPanel.setPreferredSize(new Dimension(500, 20));
     			fourthPanel.setMinimumSize(new Dimension(500, 20));
-...
     			add(Box.createVerticalStrut(10));
     			JPanel fithPanel = new JPanel();
     			int numberOfLyrs = workingTopology.getLayerCount();
     			int numberOfLyrs = originalTopology.getLayerCount();
     			fithPanel.setLayout(new BoxLayout(fithPanel, BoxLayout.X_AXIS));
     			fithPanel.add(Box.createHorizontalStrut(15));
     			fithPanel.add(new JLabel(PluginServices.getText(this, "number_of_layers")));
     			fithPanel.add(Box.createHorizontalStrut(5));
     			nLyrsLabel = new JLabel("<html><b>"+numberOfLyrs+"</b></html>");
     			fithPanel.add(nLyrsLabel);
     			fithPanel.setPreferredSize(new Dimension(500, 20));
     			fithPanel.setMinimumSize(new Dimension(500, 20));
-...
     			add(Box.createVerticalStrut(10));
     			JPanel sixthPanel = new JPanel();
     			int numberOfRules = workingTopology.getAllRules().size();
     			int numberOfRules = originalTopology.getAllRules().size();
     			sixthPanel.setLayout(new BoxLayout(sixthPanel, BoxLayout.X_AXIS));
     			sixthPanel.add(Box.createHorizontalStrut(15));
     			sixthPanel.add(new JLabel(PluginServices.getText(this, "number_of_rules")));
-...
     			sixthPanel.setAlignmentX(LEFT_ALIGNMENT);
     			add(sixthPanel);
     			add(Box.createVerticalStrut(10));
     			//if read only, disable text fields
     			if(readOnly){
     				nameTextField.setEditable(false);
     				clusterTextField.setEditable(false);
     				maxNumberOfErrorsTextField.setEditable(false);
     			}else{
     				ChangeDocumentListener changeListener = new ChangeDocumentListener();
     				nameTextField.getDocument().addDocumentListener(changeListener);
     				clusterTextField.getDocument().addDocumentListener(changeListener);
     				maxNumberOfErrorsTextField.getDocument().addDocumentListener(changeListener);
+    			}
+    		}
     		/**
-...
     		 * @return topology status as text
     		 */
     		private String getStatusAsText() {
     			byte topologyStatus = workingTopology.getStatus();
     			byte topologyStatus = originalTopology.getStatus();
     			String topologyText = null;
     			switch(topologyStatus){
     			case Topology.VALIDATED:
-...
     		public void updateContent(){
     			nameTextField.setText(workingTopology.getName());
     			clusterTextField.setText(Double.toString(workingTopology.getClusterTolerance()));
     			nameTextField.setText(originalTopology.getName());
     			clusterTextField.setText(Double.toString(originalTopology.getClusterTolerance()));
     			String statusText = getStatusAsText();
     			statusLabel.setText("<html><b>"+statusText+"</b></html>");
     			maxNumberOfErrorsTextField.setText(Integer.toString(workingTopology.getMaxNumberOfErrors()));
     			nLyrsLabel.setText("<html><b>"+workingTopology.getLayerCount()+"</b></html>");
     			nRulesLabel.setText(String.valueOf(workingTopology.getRuleCount()));
     			maxNumberOfErrorsTextField.setText(Integer.toString(originalTopology.getMaxNumberOfErrors()));
     			nLyrsLabel.setText("<html><b>"+originalTopology.getLayerCount()+"</b></html>");
     			nRulesLabel.setText(String.valueOf(originalTopology.getRuleCount()));
+    		}
+    	}
-...
+    		}
+    	}
     	//FIXME Implementar  TopologyErrorsPanel (visor alfanumerico de errores topologicos)
     	//y el panel este del TabPanel
     //	class TopologyErrorsTabPanel extends JPanel{
     //		void applyChanges(){
     //
     //		}
     //	}
+    }

     	 * to this component.
     	 */
     	private List<LayerSelectionListener> selectionListeners;
     	private boolean readOnly;
     	/**
     	 * Constructor.
-...
     	 * @param layers List of layers to initialize the table content
     	 */
     	public LayerSelectionPanel(List<FLayer> layers, MapContext mapContext){
     		this(layers, mapContext, false);
+    	}
     	public LayerSelectionPanel(List<FLayer> layers, MapContext mapContext, boolean readOnly){
     		super();
     		this.layers = layers;
     		this.mapContext = mapContext;
     		this.readOnly = readOnly;
     		selectionListeners = new ArrayList<LayerSelectionListener>();
     		initialize();
+    	}
-...
     		lyrsTable.getColumnModel().getColumn(0).setHeaderValue(
     				PluginServices.getText(null, "Layers"));
     		JScrollPane scrollTable = new JScrollPane(lyrsTable);
     		add(scrollTable, BorderLayout.CENTER);
     		if(! readOnly){
     			add(getButtonsPanel(), BorderLayout.SOUTH);
     		}//if ! readOnly
+    	}
     	/**
     	 * Creates JPanel with add layer, remove layer, remove all layers buttons.
     	 * @return
     	 */
     	private JPanel getButtonsPanel(){
     		JButton addButton = new JButton(PluginServices.getText(null, "Add_Lyr"));
     		addButton.addActionListener(new ActionListener(){
     			public void actionPerformed(ActionEvent arg0) {
-...
     		buttonPanel.add(addButton);
     		buttonPanel.add(removeButton);
     		buttonPanel.add(removeAllBtn);
     		add(buttonPanel, BorderLayout.SOUTH);
     		return buttonPanel;
+    	}
     	/**

     	 */
     	private JTable rulesTable;
     	private boolean readOnly;
     	public TopologyRulesPanel(JWizardComponents wizardComponents, ITopologyContentProvider layerProvider) {
     	public TopologyRulesPanel(JWizardComponents wizardComponents,
     			 ITopologyContentProvider layerProvider){
     		this(wizardComponents, layerProvider, false);
+    	}
     	public TopologyRulesPanel(JWizardComponents wizardComponents,
     							 ITopologyContentProvider layerProvider,
     							 boolean readOnly) {
     		super(wizardComponents, title);
     		this.contentProvider = layerProvider;
     		this.selectionListeners = new ArrayList<RuleSelectionListener>();
     		this.readOnly = readOnly;
     		setLayout(new BorderLayout());
     		rules = new ArrayList<ITopologyRule>();
     		List<ITopologyRule> existingRules = contentProvider.getRules();
-...
     		add(scrollTable, BorderLayout.CENTER);
     		if(! readOnly){
     			add(getButtonsPanel(), BorderLayout.SOUTH);
+    		}
+    	}
     	private JPanel getButtonsPanel(){
     		JButton addRuleButton = new JButton(PluginServices.getText(null, "Add_Rule"));
     		addRuleButton.addActionListener(new ActionListener(){
     			public void actionPerformed(ActionEvent arg0) {
-...
     		buttonPanel.add(addRuleButton);
     		buttonPanel.add(removeRuleButton);
     		buttonPanel.add(removeAllRulesBtn);
     		add(buttonPanel, BorderLayout.SOUTH);
     		return buttonPanel;
+    	}
+    }

Also available in: Unified diff