Changeset 6098

Timestamp:

2003-12-02T17:28:05+13:00 (20 years ago)

Author:

jmt12

Message:

Moved the special folder 'shortcuts' from collection based to shared for the installation of gli. This caused some added fun when it turned out one of the workspace tree refreshes was blocking the AWTEvent thread, despite me putting tests in place to stop that from happening. It had never reared its ugly head before, as there were never any shortcut collections being mapped when a collection had been closed, or when GLI was exiting before.

Location:

trunk/gli/classes/xml

Files:

• config.xml (modified) (3 diffs)
• template.col (modified) (3 diffs)

trunk/gli/classes/xml/config.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Configuration [
-  <!ELEMENT Configuration  (GathererConfig, Other)>
+  <!ELEMENT Configuration  (GathererConfig, Other, DirectoryMappings)>
   <!ELEMENT GathererConfig (Argument*)>
   <!ELEMENT Argument       (#PCDATA)>
@@ -17 +17 @@
   <!ELEMENT Name           (#PCDATA)>
   <!ELEMENT Desc           (#PCDATA)>
+  <!ELEMENT DirectoryMappings (Mapping*)>
+  <!ELEMENT Mapping           (#PCDATA)>
+  <!ATTLIST Mapping 
+            name              CDATA #REQUIRED
+        file              CDATA #REQUIRED>
 ]>
 
@@ -117 +122 @@
   </GathererConfig>
   <Other/>
+  <DirectoryMappings/>
 </Configuration>

trunk/gli/classes/xml/template.col

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE GathererCollection [
-  <!ELEMENT GathererCollection (Argument*, GathererConfig, BuildConfig, DirectoryMappings)>
+  <!ELEMENT GathererCollection (Argument*, GathererConfig, BuildConfig)>
   <!ELEMENT GathererConfig    (Arguments*)>
   <!ELEMENT BuildConfig       (Build, Import)>
@@ -10 +10 @@
             name              CDATA #REQUIRED
                 enabled           CDATA "true">
-  <!ELEMENT DirectoryMappings (Mapping*)>
-  <!ELEMENT Mapping           (#PCDATA)>
-  <!ATTLIST Mapping 
-            name              CDATA #REQUIRED
-                file              CDATA #REQUIRED>
 ]>
 
@@ -25 +20 @@
      <Import/>
   </BuildConfig>
-  <DirectoryMappings/>
 </GathererCollection>