Revision 119 org.gvsig.toolbox/trunk/org.gvsig.toolbox/org.gvsig.toolbox.gui/src/main/java/es/unex/sextante/gui/settings/SextanteSagaSettingsPanel.java

View differences:

SextanteSagaSettingsPanel.java
36 36
	private JLabel             jLabelSagaFolder;
37 37
	private FileSelectionPanel jSagaFolder;
38 38
	private JLabel             jLabelUpdate;
39
	private JButton            jButtonUpdate;   
39
	private JButton            jButtonUpdate;
40 40

  
41 41

  
42 42

  
......
49 49
					TableLayoutConstants.FILL,
50 50
					SextanteConfigurationDialog.SPACER_SMALL},
51 51
					{ SextanteConfigurationDialog.SPACER_SMALL,
52
						TableLayoutConstants.MINIMUM, // row 1 
52
						TableLayoutConstants.MINIMUM, // row 1
53 53
						TableLayoutConstants.MINIMUM, // row 2
54 54
						TableLayoutConstants.MINIMUM, // row 3
55 55
						TableLayoutConstants.MINIMUM, // row 4
......
69 69
		this.add(jActivateCheckBox, "1, 1");
70 70

  
71 71
		this.add(new JSeparator(SwingConstants.HORIZONTAL), "1, 2, 2, 2");
72
		/* ----------------------------------------------------------- */		
72
		/* ----------------------------------------------------------- */
73 73

  
74 74
		jPortableCheckBox = new JCheckBox(Sextante.getText("Portable"));
75 75
		final String sActivatePortable = SextanteGUI.getSettingParameterValue(SextanteSagaSettings.SAGA_PORTABLE);
76 76
		final boolean bActivatePortable = Boolean.parseBoolean(sActivatePortable);
77 77
		jPortableCheckBox.setEnabled(bActivate);
78 78
		jPortableCheckBox.setSelected(bActivatePortable);
79
		this.add(jPortableCheckBox, "1, 3");		
79
		this.add(jPortableCheckBox, "1, 3");
80 80

  
81 81
		jLabelSagaFolder = new JLabel();
82 82
		jLabelSagaFolder.setEnabled(bActivate);
......
102 102
		jLabelUpdate = new JLabel();
103 103
		jLabelUpdate.setText( Sextante.getText("update_library") );
104 104
		jLabelUpdate.setEnabled(bActivate);
105
		this.add(jLabelUpdate, "1, 6");      
105
		this.add(jLabelUpdate, "1, 6");
106 106
		jButtonUpdate = new JButton(Sextante.getText("load_SAGA_modules"));
107 107
		jButtonUpdate.setEnabled(bActivate);
108 108
		this.add(jButtonUpdate, "2, 6");
......
120 120

  
121 121
		/**********************************/
122 122
		/** Action listeners for widgets **/
123
		/**********************************/		
123
		/**********************************/
124 124

  
125 125
		jActivateCheckBox.addActionListener(new ActionListener() {
126 126
			public void actionPerformed(final ActionEvent arg0) {
......
135 135
				jSagaFolder.getTextField().setEnabled(active);
136 136
				jSagaFolder.getButton().setEnabled(active);
137 137
				jLabelUpdate.setEnabled(active);
138
				jButtonUpdate.setEnabled(active);				
138
				jButtonUpdate.setEnabled(active);
139 139
				jActivateCheckBox.getParent().repaint();
140 140
				active = jPortableCheckBox.isSelected();
141 141
				if ( active == true ) {
142 142
					jLabelSagaFolder.setEnabled(false);
143 143
					jSagaFolder.getTextField().setEnabled(false);
144 144
					jSagaFolder.getButton().setEnabled(false);
145
				}				
145
				}
146 146
				setCursor(new Cursor(Cursor.DEFAULT_CURSOR));
147 147
			}
148
		});		
148
		});
149 149

  
150 150
		jPortableCheckBox.addActionListener(new ActionListener() {
151
			public void actionPerformed(final ActionEvent arg0) {        	 
151
			public void actionPerformed(final ActionEvent arg0) {
152 152
				setCursor(new Cursor(Cursor.WAIT_CURSOR));
153 153
				SextanteGUI.setSettingParameterValue(SextanteSagaSettings.SAGA_PORTABLE,
154
						new Boolean(jPortableCheckBox.isSelected()).toString());             
154
						new Boolean(jPortableCheckBox.isSelected()).toString());
155 155
				//Set portable SAGA bin dir
156 156
				SextanteGUI.checkDir ( Sextante.PORTABLE_SAGA_FOLDER, true, "SAGA GIS" );
157
				String sPath = new String (SextanteGUI.getSextantePath() + File.separator + 
157
				String sPath = new String (SextanteGUI.getSextanteInstallPath() + File.separator +
158 158
						Sextante.PORTABLE_SAGA_FOLDER);
159 159
				SextanteGUI.setSettingParameterValue(SextanteSagaSettings.SAGA_FOLDER, sPath);
160 160
				jSagaFolder.setFilepath(sPath);
......
168 168
				} else {
169 169
					jLabelSagaFolder.setEnabled(true);
170 170
					jSagaFolder.getTextField().setEnabled(true);
171
					jSagaFolder.getButton().setEnabled(true);					
171
					jSagaFolder.getButton().setEnabled(true);
172 172

  
173 173
				}
174 174
				setCursor(new Cursor(Cursor.DEFAULT_CURSOR));
175 175
			}
176
		});		
176
		});
177 177

  
178 178
		jButtonUpdate.addActionListener(new ActionListener() {
179 179
			public void actionPerformed(final ActionEvent arg0) {
180 180
				SextanteGUI.setSettingParameterValue(SextanteSagaSettings.SAGA_FOLDER, jSagaFolder.getFilepath());
181 181
				setupSaga();
182 182
			}
183
		});		
183
		});
184 184

  
185 185
	}
186 186

  
......
189 189

  
190 190
		try {
191 191
			this.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
192
			SagaUtils.installSaga();			
192
			SagaUtils.installSaga();
193 193
			SextanteGUI.updateAlgorithmProvider(SagaAlgorithmProvider.class);
194 194
			final HashMap<String, GeoAlgorithm> algs = Sextante.getAlgorithms().get("SAGA");
195 195
			int iNumAlgs = 0;
......
218 218
		final String path = jSagaFolder.getFilepath();
219 219
		if (path != null) {
220 220
			map.put(SextanteSagaSettings.SAGA_FOLDER, path);
221
		}		
221
		}
222 222
		return map;
223 223

  
224 224
	}

Also available in: Unified diff