felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From db...@apache.org
Subject svn commit: r980760 - in /felix/trunk/sigil/common/core/src/org/apache/felix/sigil/config: BldConfig.java BldConverter.java BldProject.java
Date Fri, 30 Jul 2010 12:35:20 GMT
Author: dbaum
Date: Fri Jul 30 12:35:19 2010
New Revision: 980760

URL: http://svn.apache.org/viewvc?rev=980760&view=rev
Log:
FELIX-2495 fix UI saving of multi-bundle peojects.

Modified:
    felix/trunk/sigil/common/core/src/org/apache/felix/sigil/config/BldConfig.java
    felix/trunk/sigil/common/core/src/org/apache/felix/sigil/config/BldConverter.java
    felix/trunk/sigil/common/core/src/org/apache/felix/sigil/config/BldProject.java

Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/config/BldConfig.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/config/BldConfig.java?rev=980760&r1=980759&r2=980760&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/config/BldConfig.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/config/BldConfig.java Fri Jul
30 12:35:19 2010
@@ -161,7 +161,7 @@ public class BldConfig
             }
             else
             {
-                String dval = (dflt == null ? dflt.getString(null, key) : null);
+                String dval = (dflt != null ? dflt.getString(null, key) : null);
                 if (value.equals("") && (dval == null || dval.equals("")))
                 {
                     string.remove(key);

Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/config/BldConverter.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/config/BldConverter.java?rev=980760&r1=980759&r2=980760&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/config/BldConverter.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/config/BldConverter.java Fri
Jul 30 12:35:19 2010
@@ -254,8 +254,11 @@ public class BldConverter
         
         setSimpleHeaders(id, info);
         setExports(id, bundleVersion, info, exports);
-        setImports(id, bundleVersion, info, exports);
-        setRequires(id, bundleVersion, info);
+        
+        // -imports and -requires are global to all bundles
+        setImports(null, bundleVersion, info, exports);
+        setRequires(null, bundleVersion, info);
+        
         setFragments(id, info);
         setContents(id, info, bundle);
         setLibraries(id, info, bundle);
@@ -383,9 +386,10 @@ public class BldConverter
             config.setMap( id, BldConfig.M_LIBS, libs );
         }
 
-        if ( !sources.isEmpty() || !config.getList( id, BldConfig.L_SRC_CONTENTS ).isEmpty()
)
+        // -sourcedirs is global to all bundles
+        if ( !sources.isEmpty() || !config.getList( null, BldConfig.L_SRC_CONTENTS ).isEmpty()
)
         {
-            config.setList( id, BldConfig.L_SRC_CONTENTS, sources );
+            config.setList( null, BldConfig.L_SRC_CONTENTS, sources );
         }
 
     }

Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/config/BldProject.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/config/BldProject.java?rev=980760&r1=980759&r2=980760&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/config/BldProject.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/config/BldProject.java Fri Jul
30 12:35:19 2010
@@ -358,11 +358,11 @@ public class BldProject implements IBldP
     /**
      * set internal OSGiImport and isDependency flags, based on external
      * resolve= attribute.
-     * 
-     * OSGiImport: AUTO ALWAYS NEVER dependency: default - compile !dependency:
-     * auto runtime ignore
-     * 
      */
+     // OSGiImport:    AUTO    ALWAYS     NEVER
+     // dependency:    default -          compile
+     // !dependency:   auto    runtime    ignore
+
     private void setResolve(IPackageImport pi, String resolve) throws IOException
     {
         if (pi.isOptional())



Mime
View raw message