felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dsav...@apache.org
Subject svn commit: r801929 - in /felix/trunk/sigil: common/core/src/org/apache/felix/sigil/core/ common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/ eclipse/core/src/org/apache/felix/sigil/eclipse/ eclipse/search/src/org/apache/felix/sigil/sea...
Date Fri, 07 Aug 2009 10:07:33 GMT
Author: dsavage
Date: Fri Aug  7 10:07:33 2009
New Revision: 801929

URL: http://svn.apache.org/viewvc?rev=801929&view=rev
Log:
tidy up cauldron.org references

Modified:
    felix/trunk/sigil/common/core/src/org/apache/felix/sigil/core/BldCore.java
    felix/trunk/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/SigilBundle.java
    felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/SigilCore.java
    felix/trunk/sigil/eclipse/search/src/org/apache/felix/sigil/search/SigilSearch.java

Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/core/BldCore.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/core/BldCore.java?rev=801929&r1=801928&r2=801929&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/core/BldCore.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/core/BldCore.java Fri Aug  7
10:07:33 2009
@@ -78,11 +78,10 @@
 
     public static void init() throws Exception
     {
-        String uri = "http://sigil.codecauldron.org/xml/sigil-namespace";
-        ModelElementFactory.getInstance().register( ISigilBundle.class, SigilBundle.class,
"bundle", "sigil", uri );
-        ModelElementFactory.getInstance().register( ILibrary.class, Library.class, "library",
"sigil", uri );
+        ModelElementFactory.getInstance().register( ISigilBundle.class, SigilBundle.class,
"bundle", "sigil", null );
+        ModelElementFactory.getInstance().register( ILibrary.class, Library.class, "library",
"sigil", null );
         ModelElementFactory.getInstance().register( ILibraryImport.class, LibraryImport.class,
"library-import",
-            "sigil", uri );
+            "sigil", null );
 
         // osgi elements
         ModelElementFactory.getInstance().register( IBundleModelElement.class, BundleModelElement.class,
"bundle",

Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/SigilBundle.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/SigilBundle.java?rev=801929&r1=801928&r2=801929&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/SigilBundle.java
(original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/SigilBundle.java
Fri Aug  7 10:07:33 2009
@@ -85,26 +85,30 @@
         progress.subTask( "Synchronizing " + bundle.getSymbolicName() + " binary" );
         sync( location, bundle.getUpdateLocation(), progress.newChild( 45 ) );
 
-        try
-        {
-            progress.subTask( "Synchronizing " + bundle.getSymbolicName() + " source" );
-            sync( sourcePathLocation, bundle.getSourceLocation(), progress.newChild( 45 )
);
-        }
-        catch ( IOException e )
-        {
-            BldCore.error( "Failed to download source for " + bundle.getSymbolicName() +
" " + bundle.getVersion(), e
-                .getCause() );
-        }
-
-        try
-        {
-            progress.subTask( "Synchronizing " + bundle.getSymbolicName() + " licence" );
-            sync( licencePathLocation, bundle.getLicenseURI(), progress.newChild( 10 ) );
+        if ( bundle.getSourceLocation() != null ) {
+            try
+            {
+                progress.subTask( "Synchronizing " + bundle.getSymbolicName() + " source"
);
+                sync( sourcePathLocation, bundle.getSourceLocation(), progress.newChild(
45 ) );
+            }
+            catch ( IOException e )
+            {
+                BldCore.error( "Failed to download source for " + bundle.getSymbolicName()
+ " " + bundle.getVersion(), e
+                    .getCause() );
+            }
         }
-        catch ( IOException e )
-        {
-            BldCore.error( "Failed to download licence for " + bundle.getSymbolicName() +
" " + bundle.getVersion(), e
-                .getCause() );
+        
+        if ( bundle.getLicenseURI() != null ) {
+            try
+            {
+                progress.subTask( "Synchronizing " + bundle.getSymbolicName() + " licence"
);
+                sync( licencePathLocation, bundle.getLicenseURI(), progress.newChild( 10
) );
+            }
+            catch ( IOException e )
+            {
+                BldCore.error( "Failed to download licence for " + bundle.getSymbolicName()
+ " " + bundle.getVersion(), e
+                    .getCause() );
+            }
         }
     }
 
@@ -119,9 +123,9 @@
     {
         try
         {
-            if ( local != null && !local.toFile().exists() )
+            if ( remote != null )
             {
-                if ( remote != null )
+                if ( local != null && !local.toFile().exists() )
                 {
                     URL url = remote.toURL();
                     URLConnection connection = url.openConnection();

Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/SigilCore.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/SigilCore.java?rev=801929&r1=801928&r2=801929&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/SigilCore.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/SigilCore.java Fri Aug
 7 10:07:33 2009
@@ -465,9 +465,7 @@
     {
         // trick to get eclipse to lazy load BldCore for model elements
         BldCore.getLicenseManager();
-        String uri = "http://sigil.codecauldron.org/xml/sigil-namespace";
-        ModelElementFactory.getInstance().register( ISigilProjectModel.class, SigilProject.class,
"project", "sigil",
-            uri );
+        ModelElementFactory.getInstance().register( ISigilProjectModel.class, SigilProject.class,
"project", "sigil", null );
     }
 
 

Modified: felix/trunk/sigil/eclipse/search/src/org/apache/felix/sigil/search/SigilSearch.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/search/src/org/apache/felix/sigil/search/SigilSearch.java?rev=801929&r1=801928&r2=801929&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/search/src/org/apache/felix/sigil/search/SigilSearch.java (original)
+++ felix/trunk/sigil/eclipse/search/src/org/apache/felix/sigil/search/SigilSearch.java Fri
Aug  7 10:07:33 2009
@@ -60,7 +60,7 @@
 {
 
     // The plug-in ID
-    public static final String PLUGIN_ID = "org.cauldron.sigil.search";
+    public static final String PLUGIN_ID = "org.apache.felix.sigil.eclipse.search";
 
     private static final String CLASS_EXTENSION = ".class";
 



Mime
View raw message