Changeset 18693
- Timestamp:
- 2009-03-16T17:40:58+13:00 (15 years ago)
- Location:
- greenstone3/trunk/src/java/org/greenstone/server
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
greenstone3/trunk/src/java/org/greenstone/server/BaseProperty.java
r18655 r18693 16 16 public final String BROWSER_PATH = "browser.path"; 17 17 18 protected BaseProperty(String gsdl_home, 19 String gsdl_version, String web_port) 18 public final String SERVER_CONTROL; 19 public final String SERVER_SETTINGS; 20 21 protected BaseProperty(String version, String web_port) 20 22 { 21 GSDL_HOME = gsdl_home; 22 GSDL_VERSION = gsdl_version; 23 // property names 23 24 WEB_PORT = web_port; 25 GSDL_HOME = "gsdl"+version +".home"; 26 GSDL_VERSION = "gsdl"+version+".version"; 27 SERVER_CONTROL = "Server"+version+"Control"; 28 SERVER_SETTINGS = "Server"+version+"Settings"; 24 29 } 25 30 -
greenstone3/trunk/src/java/org/greenstone/server/BaseServerControl.java
r18690 r18693 50 50 51 51 52 String title = BaseServer.dictionary.get( "ServerControl.Title");52 String title = BaseServer.dictionary.get(BaseServer.Property.SERVER_CONTROL+".Title"); 53 53 title_label.setText(stringToHTML(title)); 54 54 title_label.setOpaque(false); … … 58 58 59 59 JLabel version_label = new JLabel(); 60 String version = BaseServer.dictionary.get( "ServerControl.Version").toLowerCase();60 String version = BaseServer.dictionary.get(BaseServer.Property.SERVER_CONTROL+".Version").toLowerCase(); 61 61 62 62 version_label.setText(stringToHTML(version)); -
greenstone3/trunk/src/java/org/greenstone/server/BaseServerSettings.java
r18690 r18693 81 81 setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); 82 82 83 JLabel port_label = new JLabel(BaseServer.dictionary.get( "ServerSettings.Tomcat_Port"));83 JLabel port_label = new JLabel(BaseServer.dictionary.get(BaseServer.Property.SERVER_SETTINGS+".Port")); 84 84 85 85 portNumber_spinner = new JSpinner(new SpinnerNumberModel(portNum,1,65535,1)); -
greenstone3/trunk/src/java/org/greenstone/server/Server2Property.java
r18655 r18693 8 8 { 9 9 // Initialising customised final variables 10 // GSDL_HOME, GSDL_VERSION, WEB_PORT11 super(" gsdl2.home", "gsdl2.version", "apache.port");10 // Version number, WEB_PORT 11 super("2", "apache.port"); 12 12 } 13 13 -
greenstone3/trunk/src/java/org/greenstone/server/Server2Settings.java
r18668 r18693 15 15 protected JPanel createServletPanel() 16 16 { 17 JLabel prefix_label = new JLabel(server.dictionary.get( "ServerSettings.Library_Prefix"));17 JLabel prefix_label = new JLabel(server.dictionary.get(BaseServer.Property.SERVER_SETTINGS+".URL")); 18 18 19 19 JComboBox prefix_combobox = new JComboBox(); -
greenstone3/trunk/src/java/org/greenstone/server/Server3Property.java
r18655 r18693 8 8 { 9 9 // Initialising customised final variables 10 // GSDL_HOME, GSDL_VERSION, WEB_PORT11 super(" gsdl3.home", "gsdl3.version", "tomcat.port");10 // Version number, WEB_PORT 11 super("3", "tomcat.port"); 12 12 } 13 13 -
greenstone3/trunk/src/java/org/greenstone/server/Server3Settings.java
r18667 r18693 27 27 { 28 28 29 JLabel servlet_label = new JLabel(server.dictionary.get( "ServerSettings.Servlet"));29 JLabel servlet_label = new JLabel(server.dictionary.get(BaseServer.Property.SERVER_SETTINGS+".URL")); 30 30 31 31 servlet_combobox = new JComboBox();
Note:
See TracChangeset
for help on using the changeset viewer.