commit d5a1aa018a5b8bd8f8891e93b6243290eae9ee68
author Stuart McCulloch <mcculls@apache.org> Tue Jan 29 11:58:01 2008 +0000
committer Stuart McCulloch <mcculls@apache.org> Tue Jan 29 11:58:01 2008 +0000
tree b6bea0db91227d4ecf699918e6989dcfbc2e3ca8
parent 5bdab383477465a012775062c3450b24fa17236e

FELIX-472: refactor property update code

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@616274 13f79535-47bb-0310-9956-ffa450edef68

bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java

diff --git a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java
index ca10558..aa94b86 100644
--- a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java
+++ b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java
@@ -291,27 +291,6 @@
         File sourceFile = dependency.getFile();
         if ( null != sourceFile && sourceFile.exists() )
         {
-            String bundleClassPath = properties.getProperty( Analyzer.BUNDLE_CLASSPATH );
-            String includeResource = properties.getProperty( Analyzer.INCLUDE_RESOURCE );
-
-            if ( null == bundleClassPath )
-            {
-                bundleClassPath = ".,";
-            }
-            else if ( bundleClassPath.length() > 0 )
-            {
-                bundleClassPath += ",";
-            }
-
-            if ( null == includeResource )
-            {
-                includeResource = "";
-            }
-            else if ( includeResource.length() > 0 )
-            {
-                includeResource += ",";
-            }
-
             String embedDirectory = m_embedDirectory;
             if ( "".equals( embedDirectory ) || ".".equals( embedDirectory ) )
             {
@@ -349,8 +328,32 @@
                 targetFilePath = targetFilePath.replace( File.separatorChar, '/' );
             }
 
+            String bundleClassPath = properties.getProperty( Analyzer.BUNDLE_CLASSPATH );
+            String includeResource = properties.getProperty( Analyzer.INCLUDE_RESOURCE );
+
+            if ( null == includeResource )
+            {
+                includeResource = "";
+            }
+            else if ( includeResource.length() > 0 )
+            {
+                includeResource += ",";
+            }
+
+            includeResource += targetFilePath;
+            includeResource += "=";
+            includeResource += sourceFile;
+
+            if ( null == bundleClassPath )
+            {
+                bundleClassPath = ".,";
+            }
+            else if ( bundleClassPath.length() > 0 )
+            {
+                bundleClassPath += ",";
+            }
+
             bundleClassPath += targetFilePath;
-            includeResource += targetFilePath + "=" + sourceFile;
 
             properties.setProperty( Analyzer.BUNDLE_CLASSPATH, bundleClassPath );
             properties.setProperty( Analyzer.INCLUDE_RESOURCE, includeResource );
@@ -374,7 +377,8 @@
                 includeResource += ",";
             }
 
-            includeResource += "@" + sourceFile;
+            includeResource += "@";
+            includeResource += sourceFile;
 
             properties.setProperty( Analyzer.INCLUDE_RESOURCE, includeResource );
         }