Changeset 5086

Timestamp:

2003-08-04T11:42:46+12:00 (21 years ago)

Author:

jmt12

Message:

Changed special collection metadata values so they can be retrieved directly (rather than going through CollectionMetaManager)

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/GeneralManager.java (modified) (3 diffs)

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

@@ -189 +189 @@
         super();
         // Retrieve some of the model elements, those we know aren't language dependant
-        beta_collectionmeta = CollectionDesignManager.collectionmeta_manager.getMetadatum(CollectionConfiguration.COLLECTIONMETADATA_BETA_STR);
-        public_collectionmeta = CollectionDesignManager.collectionmeta_manager.getMetadatum(CollectionConfiguration.COLLECTIONMETADATA_PUBLIC_STR);
+        beta_collectionmeta = new CollectionMeta(CollectionDesignManager.collect_config.getBeta());
+        public_collectionmeta = new CollectionMeta(CollectionDesignManager.collect_config.getPublic());
        
         // Creation
@@ -200 +200 @@
         instructions_textarea.setEditable(false);
         instructions_textarea.setLineWrap(true);
-        instructions_textarea.setRows(4);
+        instructions_textarea.setRows(6);
         instructions_textarea.setWrapStyleWord(true);
 
@@ -317 +317 @@
         collection_extra_collectionmeta = CollectionDesignManager.collectionmeta_manager.getMetadatum(CollectionConfiguration.COLLECTIONMETADATA_COLLECTIONEXTRA_STR);
         collection_name_collectionmeta = CollectionDesignManager.collectionmeta_manager.getMetadatum(CollectionConfiguration.COLLECTIONMETADATA_COLLECTIONNAME_STR);
-        creator_collectionmeta = CollectionDesignManager.collectionmeta_manager.getMetadatum(CollectionConfiguration.COLLECTIONMETADATA_CREATOR_STR);
+        creator_collectionmeta = new CollectionMeta(CollectionDesignManager.collect_config.getCreator());
         icon_collection_collectionmeta = CollectionDesignManager.collectionmeta_manager.getMetadatum(CollectionConfiguration.COLLECTIONMETADATA_ICONCOLLECTION_STR);
         icon_collection_small_collectionmeta = CollectionDesignManager.collectionmeta_manager.getMetadatum(CollectionConfiguration.COLLECTIONMETADATA_ICONCOLLECTIONSMALL_STR);
-        maintainer_collectionmeta = CollectionDesignManager.collectionmeta_manager.getMetadatum(CollectionConfiguration.COLLECTIONMETADATA_MAINTAINER_STR);
+        maintainer_collectionmeta = new CollectionMeta(CollectionDesignManager.collect_config.getMaintainer());
         // Make sure the components are up to date
         creator_emailfield.setText(creator_collectionmeta.getValue());