- Timestamp:
- 2007-09-25T10:13:24+12:00 (17 years ago)
- Location:
- gli/trunk/src/org/greenstone/gatherer
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
gli/trunk/src/org/greenstone/gatherer/GAuthenticator.java
r12115 r14567 64 64 private JPasswordField password = null; 65 65 /** The default size of this dialog. */ 66 static final private Dimension SIZE = new Dimension(4 10,140);66 static final private Dimension SIZE = new Dimension(470,160); 67 67 68 68 /** Constructor. */ -
gli/trunk/src/org/greenstone/gatherer/Gatherer.java
r14372 r14567 132 132 } 133 133 134 static private URL default_gliserver_url=null; 134 135 135 136 public Gatherer(String[] args) … … 291 292 if (Configuration.library_url == null) { 292 293 missingEXEC(); 293 if ((Configuration.library_url!=null) && isGsdlRemote && GS3 && (gliserver_url_string==null)){ 294 Configuration.gliserver_url = new URL(Configuration.library_url.toString() + "/cgi-bin/gliserver4gs3.pl"); 295 gliserver_url_string = Configuration.gliserver_url.toString(); 296 Configuration.setString("general.gliserver_url", true, gliserver_url_string); 294 if ((Configuration.library_url!=null) && isGsdlRemote && (gliserver_url_string==null)){ 295 if (GS3){ 296 default_gliserver_url = new URL(Configuration.library_url.toString() + "/cgi-bin/gliserver4gs3.pl"); 297 }else{ 298 default_gliserver_url = new URL(Configuration.library_url.toString().substring(0,Configuration.library_url.toString().lastIndexOf("/library")) + "/gliserver.pl"); 299 } 300 missingGLIServer(); 297 301 } 298 302 } … … 313 317 if (isGsdlRemote) { 314 318 if (Configuration.gliserver_url == null) { 319 if (Configuration.library_url != null) { 320 if (GS3){ 321 default_gliserver_url = new URL(Configuration.library_url.toString() + "/cgi-bin/gliserver4gs3.pl"); 322 }else{ 323 default_gliserver_url = new URL(Configuration.library_url.toString().substring(0,Configuration.library_url.toString().lastIndexOf("/library")) + "/gliserver.pl"); 324 } 325 } 315 326 missingGLIServer(); 316 327 } … … 781 792 } 782 793 dialog.setValueField(new URLField(Configuration.getColor("coloring.editable_foreground", false), Configuration.getColor("coloring.editable_background", false))); 794 795 if (Gatherer.default_gliserver_url!=null){ 796 dialog.setValueField(Gatherer.default_gliserver_url.toString()); 797 } 798 783 799 dialog.display(); 784 800 dialog.dispose(); 785 801 dialog = null; 786 802 787 803 String gliserver_url_string = Configuration.getString("general.gliserver_url", true); 788 804 if (!gliserver_url_string.equals("")) { -
gli/trunk/src/org/greenstone/gatherer/gui/WarningDialog.java
r13397 r14567 154 154 if(affected_property != null && Configuration.self != null) { 155 155 String value = value_field.getText(); 156 System.out.println("-------- warningdialog value: "+value); 156 157 if(value.length() > 0) { 157 158 if(value_field instanceof URLField) { 158 159 bad_value = !((URLField)value_field).validateURL(); 160 System.out.println("-------- warningdialog bad_value: "+bad_value); 159 161 } 160 162 if(!bad_value) { 161 163 // Store the value of the property 162 164 Configuration.setString(affected_property, true, value_field.getText()); 165 System.out.println("-------- warningdialog affected_property: "+affected_property); 166 System.out.println("-------- warningdialog value_field.getText(): "+value_field.getText()); 167 System.out.println("-------- warningdialog Configuration.getString(general.gliserver_url, true): "+Configuration.getString("general.gliserver_url", true)); 163 168 } 164 169 } … … 166 171 if(!bad_value) { 167 172 result = JOptionPane.OK_OPTION; 173 System.out.println("-------- warningdialog result: "+result); 168 174 } 169 175 } … … 251 257 } 252 258 } 259 260 public void setValueField(String field_value){ 261 this.value_field.setText(field_value); 262 } 263 253 264 }
Note:
See TracChangeset
for help on using the changeset viewer.