Changeset 10552

Timestamp:

2005-08-23T15:08:42+12:00 (19 years ago)

Author:

kjdon

Message:

removed the commented out references to old 'beta' element of config file

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• cdm/GeneralManager.java (modified) (8 diffs)
• util/StaticStrings.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/cdm/GeneralManager.java

@@ -147 +147 @@
     private boolean has_been_warned = false;
     private boolean ready = false;
-    //private CollectionMeta beta_collectionmeta;
     private CollectionMeta collection_extra_collectionmeta;
     private CollectionMeta collection_name_collectionmeta;
@@ -163 +162 @@
     /** Button to browse for the collection home page icon. */
     private JButton browse_home_icon_button;
-    /** The checkbox controlling the state of the collection. */
-    //private JCheckBox beta_checkbox;
     /** The checkbox controlling public access to the collection. */
     private JCheckBox public_checkbox;
@@ -187 +184 @@
         super();
         // Retrieve some of the model elements, those we know aren't language dependant
-        //beta_collectionmeta = new CollectionMeta(CollectionDesignManager.collect_config.getBeta());
         public_collectionmeta = new CollectionMeta(CollectionDesignManager.collect_config.getPublic());
 
@@ -246 +242 @@
         Dictionary.registerText(browse_home_icon_button, "General.Browse");
 
-        // public and beta
+        // public
         JPanel box_panel = new JPanel();
         public_checkbox = new JCheckBox("", public_collectionmeta.getValue(CollectionMeta.TEXT).equals(CollectionConfiguration.TRUE_STR));
         Dictionary.registerText(public_checkbox, "CDM.General.Access");
-        //beta_checkbox = new JCheckBox("", beta_collectionmeta.getValue(CollectionMeta.TEXT).equals(CollectionConfiguration.TRUE_STR));
-        //Dictionary.registerText(beta_checkbox, "CDM.General.Beta");
 
         JPanel description_panel = new JPanel();
@@ -260 +254 @@
         Dictionary.registerTooltip(description_textarea, "CDM.General.Collection_Extra_Tooltip");
         // Connection
-        //beta_checkbox.addActionListener(CollectionDesignManager.change_listener);
         BrowseListener browse_listener = new BrowseListener(StaticStrings.IMAGES_PATH_RELATIVE_TO_GSDL_PREFIX);
         browse_about_icon_button.addActionListener(browse_listener);
@@ -334 +327 @@
         box_panel.setLayout(new GridLayout(1,1,5,2));
         box_panel.add(public_checkbox);
-        //box_panel.add(beta_checkbox);
 
         description_panel.setLayout(new BorderLayout());
@@ -382 +374 @@
         // I forgot to keep the checkboxes up to date. Why hasn't this caused problems before today?
         public_checkbox.setSelected(public_collectionmeta.getValue(CollectionMeta.TEXT).equals(CollectionConfiguration.TRUE_STR));
-        //beta_checkbox.setSelected(beta_collectionmeta.getValue(CollectionMeta.TEXT).equals(CollectionConfiguration.TRUE_STR));
         ready = true;
     }
@@ -424 +415 @@
         if(ready) {
         // Boolean values
-        //beta_collectionmeta.setValue((beta_checkbox.isSelected() ? CollectionConfiguration.TRUE_STR : CollectionConfiguration.FALSE_STR));
         public_collectionmeta.setValue((public_checkbox.isSelected() ? CollectionConfiguration.TRUE_STR : CollectionConfiguration.FALSE_STR));
         String creator_email_str = creator_emailfield.getText();

trunk/gli/src/org/greenstone/gatherer/util/StaticStrings.java

@@ -62 +62 @@
     static final public String COLLECTION_ELEMENT                         = "Collection";
     static final public String COLLECTION_STR                             = "Collection: ";
-    static final public String COLLECTIONMETADATA_BETA_ELEMENT            = "Beta";
-    static final public String COLLECTIONMETADATA_BETA_STR                = "beta";
     static final public String COLLECTIONMETADATA_COLLECTIONNAME_STR      = "collectionname";
     static final public String COLLECTIONMETADATA_COLLECTIONEXTRA_STR     = "collectionextra";