[Equanda-svn-commit] SF.net SVN: equanda: [195] trunk/equanda-generate/src/main/java/org/equanda

[<tri...@us...>]

Revision: 195
          http://equanda.svn.sourceforge.net/equanda/?rev=195&view=rev
Author:   triathlon98
Date:     2007-12-12 02:08:22 -0800 (Wed, 12 Dec 2007)

Log Message:
-----------
EQ-101 keyvalue support

Modified Paths:
--------------
    trunk/equanda-generate/src/main/java/org/equanda/generate/Generator.java
    trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMField.java

Modified: trunk/equanda-generate/src/main/java/org/equanda/generate/Generator.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/generate/Generator.java	2007-12-11 21:55:20 UTC (rev 194)
+++ trunk/equanda-generate/src/main/java/org/equanda/generate/Generator.java	2007-12-12 10:08:22 UTC (rev 195)
@@ -290,7 +290,7 @@
         // initialize key-value pairs which are available to the templates
         keyValue.clear();
         String keyValueLocation = templateDefinition.getValue( "config", "path" );
-        if ( keyValueLocation != null )
+        if ( keyValueLocation != null && !"".equals( keyValueLocation ) )
         {
             mergeKeyValues( keyValue, keyValueLocation );
         }
@@ -301,9 +301,12 @@
         {
             String key = "keyvalue" + i;
             keyValueLocation = ini.getValue( templateDefinitionFile, key );
-            if ( keyValueLocation == null ) keyValueLocation = ini.getValue( "config", key );
-            if ( keyValueLocation == null )
+            if ( keyValueLocation == null || "".equals( keyValueLocation ) )
             {
+                keyValueLocation = ini.getValue( "config", key );
+            }
+            if ( keyValueLocation == null || "".equals( keyValueLocation ) )
+            {
                 hasKeyValue = false;
             }
             else
@@ -512,10 +515,10 @@
         try
         {
             InputStream is = new EquandaResourceLoader().getResourceStream( keyValueLocation );
-            prop.load( is );
+            if ( is != null ) prop.load( is );
         }
-        catch ( IOException ioe ) {/*ignore*/}
-        catch ( ResourceNotFoundException rnfe ) {/*ignore*/}
+        catch ( IOException ioe ) { System.err.println( ioe );}
+        catch ( ResourceNotFoundException rnfe ) { System.err.println( rnfe );}
         keyValue.putAll( prop );
     }
 

Modified: trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMField.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMField.java	2007-12-11 21:55:20 UTC (rev 194)
+++ trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMField.java	2007-12-12 10:08:22 UTC (rev 195)
@@ -1156,7 +1156,7 @@
         return internal;
     }
 
-    public boolean JavisDisplayed()
+    public boolean isDisplayed()
     {
         return display;
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.