You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ds...@apache.org on 2010/08/02 19:08:20 UTC
svn commit: r981604 [10/22] - in /felix/trunk/sigil:
common/core.tests/src/org/apache/felix/sigil/common/core/
common/core.tests/src/org/apache/felix/sigil/common/core/internal/model/osgi/
common/core/src/org/apache/felix/sigil/common/bnd/ common/core/...
Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryConfiguration.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryConfiguration.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryConfiguration.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryConfiguration.java Mon Aug 2 17:08:03 2010
@@ -19,7 +19,6 @@
package org.apache.felix.sigil.eclipse.internal.model.repository;
-
import java.io.File;
import java.io.IOException;
import java.net.URL;
@@ -49,7 +48,6 @@ import org.eclipse.jface.preference.Pref
import org.eclipse.swt.graphics.Image;
import org.osgi.framework.Bundle;
-
public class RepositoryConfiguration implements IRepositoryConfiguration
{
@@ -64,33 +62,32 @@ public class RepositoryConfiguration imp
public static final String REPOSITORY_DEFAULT_SET = REPOSITORY + "default.set";
-
public List<IRepositoryModel> loadRepositories()
{
IPreferenceStore prefs = SigilCore.getDefault().getPreferenceStore();
ArrayList<IRepositoryModel> repositories = new ArrayList<IRepositoryModel>();
- for ( RepositoryType type : loadRepositoryTypes() )
+ for (RepositoryType type : loadRepositoryTypes())
{
String typeID = type.getId();
- if ( type.isDynamic() )
+ if (type.isDynamic())
{
- String instances = prefs.getString( REPOSITORY + typeID + INSTANCES );
- if ( instances.trim().length() > 0 )
+ String instances = prefs.getString(REPOSITORY + typeID + INSTANCES);
+ if (instances.trim().length() > 0)
{
- for ( String instance : instances.split( "," ) )
+ for (String instance : instances.split(","))
{
String key = REPOSITORY + typeID + "." + instance;
- repositories.add( loadRepository( instance, key, type, prefs ) );
+ repositories.add(loadRepository(instance, key, type, prefs));
}
}
}
else
{
String key = REPOSITORY + typeID;
- repositories.add( loadRepository( typeID, key, type, prefs ) );
+ repositories.add(loadRepository(typeID, key, type, prefs));
}
}
@@ -98,12 +95,11 @@ public class RepositoryConfiguration imp
return repositories;
}
-
- public IRepositoryModel findRepository( String id )
+ public IRepositoryModel findRepository(String id)
{
- for ( IRepositoryModel model : loadRepositories() )
+ for (IRepositoryModel model : loadRepositories())
{
- if ( model.getId().equals( id ) )
+ if (model.getId().equals(id))
{
return model;
}
@@ -111,92 +107,93 @@ public class RepositoryConfiguration imp
return null;
}
-
- public void saveRepositories( List<IRepositoryModel> repositories ) throws CoreException
+ public void saveRepositories(List<IRepositoryModel> repositories)
+ throws CoreException
{
IPreferenceStore prefs = getPreferences();
HashMap<IRepositoryType, List<IRepositoryModel>> mapped = new HashMap<IRepositoryType, List<IRepositoryModel>>(
- repositories.size() );
+ repositories.size());
- saveRepositoryPreferences( repositories, mapped );
- createNewEntries( mapped, prefs );
- deleteOldEntries( repositories, prefs );
+ saveRepositoryPreferences(repositories, mapped);
+ createNewEntries(mapped, prefs);
+ deleteOldEntries(repositories, prefs);
// time stamp is used as a signal to the manager
// to update its view of the stored repositories
- timeStamp( prefs );
+ timeStamp(prefs);
}
-
public List<RepositoryType> loadRepositoryTypes()
{
List<RepositoryType> repositories = new ArrayList<RepositoryType>();
IExtensionRegistry registry = Platform.getExtensionRegistry();
- IExtensionPoint p = registry.getExtensionPoint( SigilCore.REPOSITORY_PROVIDER_EXTENSION_POINT_ID );
+ IExtensionPoint p = registry.getExtensionPoint(SigilCore.REPOSITORY_PROVIDER_EXTENSION_POINT_ID);
- for ( IExtension e : p.getExtensions() )
+ for (IExtension e : p.getExtensions())
{
- for ( IConfigurationElement c : e.getConfigurationElements() )
+ for (IConfigurationElement c : e.getConfigurationElements())
{
- String id = c.getAttribute( "id" );
- String type = c.getAttribute( "type" );
- boolean dynamic = Boolean.valueOf( c.getAttribute( "dynamic" ) );
- String icon = c.getAttribute( "icon" );
- Image image = ( icon == null || icon.trim().length() == 0 ) ? null : loadImage( e, icon );
- repositories.add( new RepositoryType( id, type, dynamic, image ) );
+ String id = c.getAttribute("id");
+ String type = c.getAttribute("type");
+ boolean dynamic = Boolean.valueOf(c.getAttribute("dynamic"));
+ String icon = c.getAttribute("icon");
+ Image image = (icon == null || icon.trim().length() == 0) ? null
+ : loadImage(e, icon);
+ repositories.add(new RepositoryType(id, type, dynamic, image));
}
}
return repositories;
}
-
- public IRepositoryModel newRepositoryElement( IRepositoryType type )
+ public IRepositoryModel newRepositoryElement(IRepositoryType type)
{
String id = UUID.randomUUID().toString();
PreferenceStore prefs = new PreferenceStore();
- RepositoryModel element = new RepositoryModel( id, "", type, prefs );
- prefs.setFilename( makeFileName( element ) );
- prefs.setValue( "id", id );
+ RepositoryModel element = new RepositoryModel(id, "", type, prefs);
+ prefs.setFilename(makeFileName(element));
+ prefs.setValue("id", id);
return element;
}
-
public IRepositorySet getDefaultRepositorySet()
{
//int level = findLevel( key + LEVEL, type, prefs );
ArrayList<IRepositoryModel> reps = new ArrayList<IRepositoryModel>();
- for ( String s : PrefsUtils.stringToArray( getPreferences().getString( REPOSITORY_DEFAULT_SET ) ) )
- {
- IRepositoryModel rep = findRepository( s );
- if ( rep == null ) {
- SigilCore.error( "Missing repository for " + s );
+ for (String s : PrefsUtils.stringToArray(getPreferences().getString(
+ REPOSITORY_DEFAULT_SET)))
+ {
+ IRepositoryModel rep = findRepository(s);
+ if (rep == null)
+ {
+ SigilCore.error("Missing repository for " + s);
}
- else {
- reps.add( rep );
+ else
+ {
+ reps.add(rep);
}
}
- return new RepositorySet( reps );
+ return new RepositorySet(reps);
}
-
- public IRepositorySet getRepositorySet( String name )
+ public IRepositorySet getRepositorySet(String name)
{
String key = REPOSITORY_SET + name;
- if ( getPreferences().contains( key ) )
+ if (getPreferences().contains(key))
{
ArrayList<IRepositoryModel> reps = new ArrayList<IRepositoryModel>();
- for ( String s : PrefsUtils.stringToArray( getPreferences().getString( key ) ) )
+ for (String s : PrefsUtils.stringToArray(getPreferences().getString(key)))
{
- IRepositoryModel rep = findRepository( s );
- if ( rep == null ) {
- throw new IllegalStateException( "Missing repository for " + s );
+ IRepositoryModel rep = findRepository(s);
+ if (rep == null)
+ {
+ throw new IllegalStateException("Missing repository for " + s);
}
- reps.add( rep );
+ reps.add(rep);
}
- return new RepositorySet( reps );
+ return new RepositorySet(reps);
}
else
{
@@ -204,282 +201,270 @@ public class RepositoryConfiguration imp
}
}
-
public Map<String, IRepositorySet> loadRepositorySets()
{
IPreferenceStore store = getPreferences();
HashMap<String, IRepositorySet> sets = new HashMap<String, IRepositorySet>();
- for ( String name : PrefsUtils.stringToArray( store.getString( REPOSITORY_SETS ) ) )
+ for (String name : PrefsUtils.stringToArray(store.getString(REPOSITORY_SETS)))
{
String key = REPOSITORY_SET + name;
ArrayList<IRepositoryModel> reps = new ArrayList<IRepositoryModel>();
- for ( String s : PrefsUtils.stringToArray( getPreferences().getString( key ) ) )
+ for (String s : PrefsUtils.stringToArray(getPreferences().getString(key)))
{
- reps.add( findRepository( s ) );
+ reps.add(findRepository(s));
}
- sets.put( name, new RepositorySet( reps ) );
+ sets.put(name, new RepositorySet(reps));
}
return sets;
}
-
- public void saveRepositorySets( Map<String, IRepositorySet> sets )
+ public void saveRepositorySets(Map<String, IRepositorySet> sets)
{
IPreferenceStore store = getPreferences();
ArrayList<String> names = new ArrayList<String>();
- for ( Map.Entry<String, IRepositorySet> set : sets.entrySet() )
+ for (Map.Entry<String, IRepositorySet> set : sets.entrySet())
{
String name = set.getKey();
String key = REPOSITORY_SET + name;
ArrayList<String> ids = new ArrayList<String>();
- for ( IRepositoryModel m : set.getValue().getRepositories() )
+ for (IRepositoryModel m : set.getValue().getRepositories())
{
- ids.add( m.getId() );
+ ids.add(m.getId());
}
- store.setValue( key, PrefsUtils.listToString( ids ) );
- names.add( name );
+ store.setValue(key, PrefsUtils.listToString(ids));
+ names.add(name);
}
- for ( String name : PrefsUtils.stringToArray( store.getString( REPOSITORY_SETS ) ) )
+ for (String name : PrefsUtils.stringToArray(store.getString(REPOSITORY_SETS)))
{
- if ( !names.contains( name ) )
+ if (!names.contains(name))
{
String key = REPOSITORY_SET + name;
- store.setToDefault( key );
+ store.setToDefault(key);
}
}
- store.setValue( REPOSITORY_SETS, PrefsUtils.listToString( names ) );
- timeStamp( store );
+ store.setValue(REPOSITORY_SETS, PrefsUtils.listToString(names));
+ timeStamp(store);
}
-
- public void setDefaultRepositorySet( IRepositorySet defaultSet )
+ public void setDefaultRepositorySet(IRepositorySet defaultSet)
{
ArrayList<String> ids = new ArrayList<String>();
- for ( IRepositoryModel m : defaultSet.getRepositories() )
+ for (IRepositoryModel m : defaultSet.getRepositories())
{
- ids.add( m.getId() );
+ ids.add(m.getId());
}
IPreferenceStore prefs = getPreferences();
- prefs.setValue( REPOSITORY_DEFAULT_SET, PrefsUtils.listToString( ids ) );
- timeStamp( prefs );
+ prefs.setValue(REPOSITORY_DEFAULT_SET, PrefsUtils.listToString(ids));
+ timeStamp(prefs);
}
-
- private void timeStamp( IPreferenceStore prefs )
+ private void timeStamp(IPreferenceStore prefs)
{
- prefs.setValue( REPOSITORY_TIMESTAMP, System.currentTimeMillis() );
+ prefs.setValue(REPOSITORY_TIMESTAMP, System.currentTimeMillis());
}
-
private IPreferenceStore getPreferences()
{
return SigilCore.getDefault().getPreferenceStore();
}
-
- private void deleteOldEntries( List<IRepositoryModel> repositories, IPreferenceStore prefs )
+ private void deleteOldEntries(List<IRepositoryModel> repositories,
+ IPreferenceStore prefs)
{
- for ( IRepositoryModel e : loadRepositories() )
+ for (IRepositoryModel e : loadRepositories())
{
- if ( !repositories.contains( e ) )
+ if (!repositories.contains(e))
{
- new File( makeFileName( e ) ).delete();
- String key = makeKey( e );
- prefs.setToDefault( key + LOC );
- prefs.setToDefault( key + NAME );
+ new File(makeFileName(e)).delete();
+ String key = makeKey(e);
+ prefs.setToDefault(key + LOC);
+ prefs.setToDefault(key + NAME);
}
}
- for ( IRepositoryType type : loadRepositoryTypes() )
+ for (IRepositoryType type : loadRepositoryTypes())
{
boolean found = false;
- for ( IRepositoryModel e : repositories )
+ for (IRepositoryModel e : repositories)
{
- if ( e.getType().equals( type ) )
+ if (e.getType().equals(type))
{
found = true;
break;
}
}
- if ( !found )
+ if (!found)
{
- prefs.setToDefault( REPOSITORY + type.getId() + INSTANCES );
+ prefs.setToDefault(REPOSITORY + type.getId() + INSTANCES);
}
}
}
-
- private static void createNewEntries( HashMap<IRepositoryType, List<IRepositoryModel>> mapped,
- IPreferenceStore prefs )
+ private static void createNewEntries(
+ HashMap<IRepositoryType, List<IRepositoryModel>> mapped, IPreferenceStore prefs)
{
- for ( Map.Entry<IRepositoryType, List<IRepositoryModel>> entry : mapped.entrySet() )
+ for (Map.Entry<IRepositoryType, List<IRepositoryModel>> entry : mapped.entrySet())
{
IRepositoryType type = entry.getKey();
- if ( type.isDynamic() )
+ if (type.isDynamic())
{
StringBuffer buf = new StringBuffer();
- for ( IRepositoryModel element : entry.getValue() )
+ for (IRepositoryModel element : entry.getValue())
{
- if ( buf.length() > 0 )
+ if (buf.length() > 0)
{
- buf.append( "," );
+ buf.append(",");
}
- buf.append( element.getId() );
- saveRepository( element, prefs );
+ buf.append(element.getId());
+ saveRepository(element, prefs);
}
- prefs.setValue( REPOSITORY + type.getId() + INSTANCES, buf.toString() );
+ prefs.setValue(REPOSITORY + type.getId() + INSTANCES, buf.toString());
}
else
{
- IRepositoryModel element = entry.getValue().get( 0 );
- saveRepository( element, prefs );
+ IRepositoryModel element = entry.getValue().get(0);
+ saveRepository(element, prefs);
}
}
}
-
- private static void saveRepositoryPreferences( List<IRepositoryModel> repositories,
- HashMap<IRepositoryType, List<IRepositoryModel>> mapped ) throws CoreException
+ private static void saveRepositoryPreferences(List<IRepositoryModel> repositories,
+ HashMap<IRepositoryType, List<IRepositoryModel>> mapped) throws CoreException
{
- for ( IRepositoryModel rep : repositories )
+ for (IRepositoryModel rep : repositories)
{
try
{
- createDir( makeFileName( rep ) );
+ createDir(makeFileName(rep));
rep.getPreferences().save();
- List<IRepositoryModel> list = mapped.get( rep.getType() );
- if ( list == null )
+ List<IRepositoryModel> list = mapped.get(rep.getType());
+ if (list == null)
{
- list = new ArrayList<IRepositoryModel>( 1 );
- mapped.put( rep.getType(), list );
+ list = new ArrayList<IRepositoryModel>(1);
+ mapped.put(rep.getType(), list);
}
- list.add( rep );
+ list.add(rep);
}
- catch ( IOException e )
+ catch (IOException e)
{
- throw SigilCore.newCoreException( "Failed to save repository preferences", e );
+ throw SigilCore.newCoreException("Failed to save repository preferences",
+ e);
}
}
}
-
- private static void createDir( String fileName )
+ private static void createDir(String fileName)
{
- File file = new File( fileName );
+ File file = new File(fileName);
file.getParentFile().mkdirs();
}
-
- private static void saveRepository( IRepositoryModel element, IPreferenceStore prefs )
+ private static void saveRepository(IRepositoryModel element, IPreferenceStore prefs)
{
- String key = makeKey( element );
- prefs.setValue( key + LOC, makeFileName( element ) );
- if ( element.getType().isDynamic() )
+ String key = makeKey(element);
+ prefs.setValue(key + LOC, makeFileName(element));
+ if (element.getType().isDynamic())
{
- prefs.setValue( key + NAME, element.getName() );
+ prefs.setValue(key + NAME, element.getName());
}
- prefs.setValue( key + TIMESTAMP, now() );
+ prefs.setValue(key + TIMESTAMP, now());
}
-
private static long now()
{
return System.currentTimeMillis();
}
-
- private static String makeKey( IRepositoryModel element )
+ private static String makeKey(IRepositoryModel element)
{
IRepositoryType type = element.getType();
String key = REPOSITORY + type.getId();
- if ( type.isDynamic() )
+ if (type.isDynamic())
key = key + "." + element.getId();
return key;
}
-
- private static String makeFileName( IRepositoryModel element )
+ private static String makeFileName(IRepositoryModel element)
{
IPath path = SigilCore.getDefault().getStateLocation();
- path = path.append( "repository" );
- path = path.append( element.getType().getId() );
- path = path.append( element.getId() );
+ path = path.append("repository");
+ path = path.append(element.getType().getId());
+ path = path.append(element.getId());
return path.toOSString();
}
-
- private static RepositoryModel loadRepository( String id, String key, RepositoryType type, IPreferenceStore prefs )
+ private static RepositoryModel loadRepository(String id, String key,
+ RepositoryType type, IPreferenceStore prefs)
{
- String name = type.isDynamic() ? prefs.getString( key + NAME ) : type.getType();
+ String name = type.isDynamic() ? prefs.getString(key + NAME) : type.getType();
PreferenceStore repPrefs = new PreferenceStore();
- RepositoryModel element = new RepositoryModel( id, name, type, repPrefs );
+ RepositoryModel element = new RepositoryModel(id, name, type, repPrefs);
- String loc = prefs.getString( key + LOC );
+ String loc = prefs.getString(key + LOC);
- if ( loc == null || loc.trim().length() == 0 )
+ if (loc == null || loc.trim().length() == 0)
{
- loc = makeFileName( element );
+ loc = makeFileName(element);
}
- repPrefs.setFilename( loc );
+ repPrefs.setFilename(loc);
- if ( new File( loc ).exists() )
+ if (new File(loc).exists())
{
try
{
repPrefs.load();
}
- catch ( IOException e )
+ catch (IOException e)
{
- SigilCore.error( "Failed to load properties for repository " + key, e );
+ SigilCore.error("Failed to load properties for repository " + key, e);
}
}
- repPrefs.setValue( "id", id );
+ repPrefs.setValue("id", id);
return element;
}
-
@SuppressWarnings("unchecked")
- private static Image loadImage( IExtension ext, String icon )
+ private static Image loadImage(IExtension ext, String icon)
{
- int i = icon.lastIndexOf( "/" );
- String path = i == -1 ? "/" : icon.substring( 0, i );
- String name = i == -1 ? icon : icon.substring( i + 1 );
+ int i = icon.lastIndexOf("/");
+ String path = i == -1 ? "/" : icon.substring(0, i);
+ String name = i == -1 ? icon : icon.substring(i + 1);
- Bundle b = Platform.getBundle( ext.getContributor().getName() );
+ Bundle b = Platform.getBundle(ext.getContributor().getName());
- Enumeration<URL> en = b.findEntries( path, name, false );
+ Enumeration<URL> en = b.findEntries(path, name, false);
Image image = null;
- if ( en.hasMoreElements() )
+ if (en.hasMoreElements())
{
try
{
- image = SigilCore.loadImage( en.nextElement() );
+ image = SigilCore.loadImage(en.nextElement());
}
- catch ( IOException e )
+ catch (IOException e)
{
- SigilCore.error( "Failed to load image", e );
+ SigilCore.error("Failed to load image", e);
}
}
else
{
- SigilCore.error( "No such image " + icon + " in bundle " + b.getSymbolicName() );
+ SigilCore.error("No such image " + icon + " in bundle " + b.getSymbolicName());
}
return image;
Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryModel.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryModel.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryModel.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryModel.java Mon Aug 2 17:08:03 2010
@@ -19,12 +19,10 @@
package org.apache.felix.sigil.eclipse.internal.model.repository;
-
import org.apache.felix.sigil.eclipse.model.repository.IRepositoryModel;
import org.apache.felix.sigil.eclipse.model.repository.IRepositoryType;
import org.eclipse.jface.preference.PreferenceStore;
-
public class RepositoryModel implements IRepositoryModel
{
private String id;
@@ -35,8 +33,7 @@ public class RepositoryModel implements
private PreferenceStore preferences;
-
- public RepositoryModel( String id, String name, IRepositoryType type, PreferenceStore preferences )
+ public RepositoryModel(String id, String name, IRepositoryType type, PreferenceStore preferences)
{
this.id = id;
this.name = name;
@@ -44,59 +41,51 @@ public class RepositoryModel implements
this.preferences = preferences;
}
-
public PreferenceStore getPreferences()
{
return preferences;
}
-
public IRepositoryType getType()
{
return type;
}
-
public String getId()
{
return id;
}
-
public String getName()
{
return name;
}
-
- public void setName( String name )
+ public void setName(String name)
{
this.name = name;
}
-
@Override
- public boolean equals( Object obj )
+ public boolean equals(Object obj)
{
try
{
- RepositoryModel e = ( RepositoryModel ) obj;
- return id.equals( e.id );
+ RepositoryModel e = (RepositoryModel) obj;
+ return id.equals(e.id);
}
- catch ( ClassCastException e )
+ catch (ClassCastException e)
{
return false;
}
}
-
@Override
public int hashCode()
{
return id.hashCode();
}
-
public String toString()
{
return type.getId() + ":" + id + ":" + name;
Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryType.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryType.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryType.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryType.java Mon Aug 2 17:08:03 2010
@@ -19,11 +19,9 @@
package org.apache.felix.sigil.eclipse.internal.model.repository;
-
import org.apache.felix.sigil.eclipse.model.repository.IRepositoryType;
import org.eclipse.swt.graphics.Image;
-
public class RepositoryType implements IRepositoryType
{
private String type;
@@ -31,8 +29,7 @@ public class RepositoryType implements I
private Image icon;
private boolean dynamic;
-
- public RepositoryType( String id, String type, boolean dynamic, Image icon )
+ public RepositoryType(String id, String type, boolean dynamic, Image icon)
{
this.id = id;
this.type = type;
@@ -40,53 +37,46 @@ public class RepositoryType implements I
this.icon = icon;
}
-
public String getType()
{
return type;
}
-
public String getId()
{
return id;
}
-
public Image getIcon()
{
return icon;
}
-
public boolean isDynamic()
{
return dynamic;
}
-
@Override
- public boolean equals( Object obj )
+ public boolean equals(Object obj)
{
try
{
- RepositoryType t = ( RepositoryType ) obj;
- return t.id.equals( id );
+ RepositoryType t = (RepositoryType) obj;
+ return t.id.equals(id);
}
- catch ( ClassCastException e )
+ catch (ClassCastException e)
{
return false;
}
}
-
@Override
public int hashCode()
{
return id.hashCode();
}
-
@Override
public String toString()
{
Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/GlobalRepositoryManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/GlobalRepositoryManager.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/GlobalRepositoryManager.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/GlobalRepositoryManager.java Mon Aug 2 17:08:03 2010
@@ -19,7 +19,6 @@
package org.apache.felix.sigil.eclipse.internal.repository.eclipse;
-
import java.util.List;
import org.apache.felix.sigil.common.repository.IRepositoryManager;
@@ -27,21 +26,19 @@ import org.apache.felix.sigil.eclipse.Si
import org.apache.felix.sigil.eclipse.internal.repository.eclipse.SigilRepositoryManager;
import org.apache.felix.sigil.eclipse.model.repository.IRepositoryModel;
-
public class GlobalRepositoryManager extends SigilRepositoryManager implements IRepositoryManager
{
public GlobalRepositoryManager(RepositoryMap map)
{
- super( null, map );
+ super(null, map);
}
-
@Override
protected IRepositoryModel[] findRepositories()
{
List<IRepositoryModel> repos = SigilCore.getRepositoryConfiguration().loadRepositories();
- return repos.toArray( new IRepositoryModel[repos.size()] );
+ return repos.toArray(new IRepositoryModel[repos.size()]);
}
}
Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepository.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepository.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepository.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepository.java Mon Aug 2 17:08:03 2010
@@ -19,7 +19,6 @@
package org.apache.felix.sigil.eclipse.internal.repository.eclipse;
-
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
@@ -41,22 +40,19 @@ import org.apache.felix.sigil.eclipse.in
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
-
public class OSGiInstallRepository extends AbstractBundleRepository
{
private Map<String, List<ISigilBundle>> bundles;
-
- public OSGiInstallRepository( String id )
+ public OSGiInstallRepository(String id)
{
- super( id );
+ super(id);
}
-
public void refresh()
{
- synchronized ( this )
+ synchronized (this)
{
bundles = null;
}
@@ -64,41 +60,40 @@ public class OSGiInstallRepository exten
notifyChange();
}
-
@Override
- public void accept( IRepositoryVisitor visitor, int options )
+ public void accept(IRepositoryVisitor visitor, int options)
{
IOSGiInstall install = SigilCore.getInstallManager().getDefaultInstall();
- if ( install != null )
+ if (install != null)
{
List<ISigilBundle> found = null;
- synchronized ( this )
+ synchronized (this)
{
- found = bundles == null ? null : bundles.get( install.getId() );
+ found = bundles == null ? null : bundles.get(install.getId());
}
- if ( found == null )
+ if (found == null)
{
found = new ArrayList<ISigilBundle>();
IPath source = install.getType().getSourceLocation();
- for ( IPath p : install.getType().getDefaultBundleLocations() )
+ for (IPath p : install.getType().getDefaultBundleLocations())
{
- loadBundle( p, found, source );
+ loadBundle(p, found, source);
}
- synchronized ( this )
+ synchronized (this)
{
bundles = new HashMap<String, List<ISigilBundle>>();
- bundles.put( install.getId(), found );
+ bundles.put(install.getId(), found);
}
}
- for ( ISigilBundle b : found )
+ for (ISigilBundle b : found)
{
- if ( !visitor.visit( b ) )
+ if (!visitor.visit(b))
{
break;
}
@@ -106,64 +101,62 @@ public class OSGiInstallRepository exten
}
}
-
- private void loadBundle( IPath p, List<ISigilBundle> bundles, IPath source )
+ private void loadBundle(IPath p, List<ISigilBundle> bundles, IPath source)
{
File f = p.toFile();
JarFile jar = null;
try
{
- jar = new JarFile( f );
- ISigilBundle bundle = buildBundle( jar.getManifest(), f );
- if ( bundle != null )
+ jar = new JarFile(f);
+ ISigilBundle bundle = buildBundle(jar.getManifest(), f);
+ if (bundle != null)
{
- bundle.setLocation( f );
- bundle.setSourcePathLocation( source.toFile() );
+ bundle.setLocation(f);
+ bundle.setSourcePathLocation(source.toFile());
// XXX hard coded src location
- bundle.setSourceRootPath( "src" );
- bundles.add( bundle );
+ bundle.setSourceRootPath("src");
+ bundles.add(bundle);
}
}
- catch ( IOException e )
+ catch (IOException e)
{
- BldCore.error( "Failed to read jar file " + f, e );
+ BldCore.error("Failed to read jar file " + f, e);
}
- catch ( ModelElementFactoryException e )
+ catch (ModelElementFactoryException e)
{
- BldCore.error( "Failed to build bundle " + f, e );
+ BldCore.error("Failed to build bundle " + f, e);
}
- catch ( RuntimeException e )
+ catch (RuntimeException e)
{
- BldCore.error( "Failed to build bundle " + f, e );
+ BldCore.error("Failed to build bundle " + f, e);
}
finally
{
- if ( jar != null )
+ if (jar != null)
{
try
{
jar.close();
}
- catch ( IOException e )
+ catch (IOException e)
{
- BldCore.error( "Failed to close jar file", e );
+ BldCore.error("Failed to close jar file", e);
}
}
}
}
-
- private ISigilBundle buildBundle( Manifest manifest, File f )
+ private ISigilBundle buildBundle(Manifest manifest, File f)
{
- IBundleModelElement info = buildBundleModelElement( manifest );
+ IBundleModelElement info = buildBundleModelElement(manifest);
ISigilBundle bundle = null;
- if ( info != null )
+ if (info != null)
{
- bundle = ModelElementFactory.getInstance().newModelElement( ISigilBundle.class );
- bundle.addChild( info );
- bundle.setLocation( f );
+ bundle = ModelElementFactory.getInstance().newModelElement(ISigilBundle.class);
+ bundle.addChild(info);
+ bundle.setLocation(f);
}
return bundle;
Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepositoryProvider.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepositoryProvider.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepositoryProvider.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepositoryProvider.java Mon Aug 2 17:08:03 2010
@@ -19,17 +19,15 @@
package org.apache.felix.sigil.eclipse.internal.repository.eclipse;
-
import java.util.Properties;
import org.apache.felix.sigil.common.repository.IBundleRepository;
import org.apache.felix.sigil.common.repository.IRepositoryProvider;
-
public class OSGiInstallRepositoryProvider implements IRepositoryProvider
{
- public IBundleRepository createRepository( String id, Properties preferences )
+ public IBundleRepository createRepository(String id, Properties preferences)
{
- return new OSGiInstallRepository( id );
+ return new OSGiInstallRepository(id);
}
}
Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/RepositoryMap.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/RepositoryMap.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/RepositoryMap.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/RepositoryMap.java Mon Aug 2 17:08:03 2010
@@ -33,21 +33,20 @@ public class RepositoryMap
final Properties pref;
final IBundleRepository repo;
-
- RepositoryCache( Properties pref, IBundleRepository repo )
+ RepositoryCache(Properties pref, IBundleRepository repo)
{
this.pref = pref;
this.repo = repo;
}
}
-
+
private HashMap<String, RepositoryCache> cachedRepositories = new HashMap<String, RepositoryCache>();
synchronized void retainAll(Collection<String> ids)
{
- for ( Iterator<String> i = cachedRepositories.keySet().iterator(); i.hasNext(); )
+ for (Iterator<String> i = cachedRepositories.keySet().iterator(); i.hasNext();)
{
- if ( !ids.contains( i.next() ) )
+ if (!ids.contains(i.next()))
{
i.remove();
}
@@ -63,8 +62,7 @@ public class RepositoryMap
synchronized void put(String id, RepositoryCache cache)
{
// TODO Auto-generated method stub
-
- }
+ }
}
Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/SigilRepositoryManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/SigilRepositoryManager.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/SigilRepositoryManager.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/SigilRepositoryManager.java Mon Aug 2 17:08:03 2010
@@ -19,7 +19,6 @@
package org.apache.felix.sigil.eclipse.internal.repository.eclipse;
-
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -47,40 +46,35 @@ import org.eclipse.jface.preference.IPre
import org.eclipse.jface.util.IPropertyChangeListener;
import org.eclipse.jface.util.PropertyChangeEvent;
-
-public class SigilRepositoryManager extends AbstractRepositoryManager implements IRepositoryManager,
- IPropertyChangeListener
+public class SigilRepositoryManager extends AbstractRepositoryManager implements IRepositoryManager, IPropertyChangeListener
{
private final String repositorySet;
private RepositoryMap cachedRepositories;
- public SigilRepositoryManager( String repositorySet, RepositoryMap cachedRepositories )
+ public SigilRepositoryManager(String repositorySet, RepositoryMap cachedRepositories)
{
this.repositorySet = repositorySet;
this.cachedRepositories = cachedRepositories;
}
-
@Override
public void initialise()
{
super.initialise();
- SigilCore.getDefault().getPreferenceStore().addPropertyChangeListener( this );
+ SigilCore.getDefault().getPreferenceStore().addPropertyChangeListener(this);
}
-
public void destroy()
{
IPreferenceStore prefs = SigilCore.getDefault().getPreferenceStore();
- if ( prefs != null )
+ if (prefs != null)
{
- prefs.removePropertyChangeListener( this );
+ prefs.removePropertyChangeListener(this);
}
}
-
@Override
protected void loadRepositories()
{
@@ -90,54 +84,54 @@ public class SigilRepositoryManager exte
HashSet<String> ids = new HashSet<String>();
IRepositoryModel[] models = findRepositories();
- for ( IRepositoryModel repo : models )
+ for (IRepositoryModel repo : models)
{
try
{
- IRepositoryProvider provider = findProvider( repo.getType() );
+ IRepositoryProvider provider = findProvider(repo.getType());
String id = repo.getId();
IBundleRepository repoImpl = null;
- if ( repo.getType().isDynamic() )
+ if (repo.getType().isDynamic())
{
String instance = "repository." + repo.getType().getId() + "." + id;
- String loc = prefs.getString( instance + ".loc" );
- Properties pref = loadPreferences( loc );
- repoImpl = loadRepository( id, pref, provider );
+ String loc = prefs.getString(instance + ".loc");
+ Properties pref = loadPreferences(loc);
+ repoImpl = loadRepository(id, pref, provider);
}
else
{
- repoImpl = loadRepository( id, null, provider );
+ repoImpl = loadRepository(id, null, provider);
}
- repos.add( repoImpl );
- ids.add( id );
+ repos.add(repoImpl);
+ ids.add(id);
}
- catch ( Exception e )
+ catch (Exception e)
{
- SigilCore.error( "Failed to load repository for " + repo, e );
+ SigilCore.error("Failed to load repository for " + repo, e);
}
}
- setRepositories( repos.toArray( new IBundleRepository[repos.size()] ) );
+ setRepositories(repos.toArray(new IBundleRepository[repos.size()]));
- cachedRepositories.retainAll( ids );
+ cachedRepositories.retainAll(ids);
}
-
- private IRepositoryProvider findProvider( IRepositoryType repositoryType ) throws CoreException
+ private IRepositoryProvider findProvider(IRepositoryType repositoryType)
+ throws CoreException
{
String id = repositoryType.getId();
IExtensionRegistry registry = Platform.getExtensionRegistry();
- IExtensionPoint p = registry.getExtensionPoint( SigilCore.REPOSITORY_PROVIDER_EXTENSION_POINT_ID );
+ IExtensionPoint p = registry.getExtensionPoint(SigilCore.REPOSITORY_PROVIDER_EXTENSION_POINT_ID);
- for ( IExtension e : p.getExtensions() )
+ for (IExtension e : p.getExtensions())
{
- for ( IConfigurationElement c : e.getConfigurationElements() )
+ for (IConfigurationElement c : e.getConfigurationElements())
{
- if ( id.equals( c.getAttribute( "id" ) ) )
+ if (id.equals(c.getAttribute("id")))
{
- IRepositoryProvider provider = ( IRepositoryProvider ) c.createExecutableExtension( "class" );
+ IRepositoryProvider provider = (IRepositoryProvider) c.createExecutableExtension("class");
return provider;
}
}
@@ -146,84 +140,84 @@ public class SigilRepositoryManager exte
return null;
}
-
protected IRepositoryModel[] findRepositories()
{
- if ( repositorySet == null )
+ if (repositorySet == null)
{
return SigilCore.getRepositoryConfiguration().getDefaultRepositorySet().getRepositories();
}
else
{
- IRepositorySet set = SigilCore.getRepositoryConfiguration().getRepositorySet( repositorySet );
- if ( set == null ) {
- SigilCore.error( "Unknown repository set " + repositorySet );
+ IRepositorySet set = SigilCore.getRepositoryConfiguration().getRepositorySet(
+ repositorySet);
+ if (set == null)
+ {
+ SigilCore.error("Unknown repository set " + repositorySet);
return SigilCore.getRepositoryConfiguration().getDefaultRepositorySet().getRepositories();
}
- else {
+ else
+ {
return set.getRepositories();
}
}
}
-
- private IBundleRepository loadRepository( String id, Properties pref, IRepositoryProvider provider )
- throws RepositoryException
+ private IBundleRepository loadRepository(String id, Properties pref,
+ IRepositoryProvider provider) throws RepositoryException
{
try
{
- if ( pref == null )
+ if (pref == null)
{
pref = new Properties();
}
- RepositoryCache cache = cachedRepositories.get( id );
+ RepositoryCache cache = cachedRepositories.get(id);
- if ( cache == null || !cache.pref.equals( pref ) )
+ if (cache == null || !cache.pref.equals(pref))
{
- IBundleRepository repo = provider.createRepository( id, pref );
- cache = new RepositoryCache( pref, repo );
- cachedRepositories.put( id, cache );
+ IBundleRepository repo = provider.createRepository(id, pref);
+ cache = new RepositoryCache(pref, repo);
+ cachedRepositories.put(id, cache);
}
return cache.repo;
}
- catch ( RuntimeException e )
+ catch (RuntimeException e)
{
- throw new RepositoryException( "Failed to build repositories", e );
+ throw new RepositoryException("Failed to build repositories", e);
}
}
-
- private Properties loadPreferences( String loc ) throws FileNotFoundException, IOException
+ private Properties loadPreferences(String loc) throws FileNotFoundException,
+ IOException
{
FileInputStream in = null;
try
{
Properties pref = new Properties();
- pref.load( new FileInputStream( loc ) );
+ pref.load(new FileInputStream(loc));
return pref;
}
finally
{
- if ( in != null )
+ if (in != null)
{
try
{
in.close();
}
- catch ( IOException e )
+ catch (IOException e)
{
- SigilCore.error( "Failed to close file", e );
+ SigilCore.error("Failed to close file", e);
}
}
}
}
-
- public void propertyChange( PropertyChangeEvent event )
+ public void propertyChange(PropertyChangeEvent event)
{
- if ( event.getProperty().equals( "repository.timestamp" ) )
+ if (event.getProperty().equals("repository.timestamp"))
{
loadRepositories();
}
Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepository.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepository.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepository.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepository.java Mon Aug 2 17:08:03 2010
@@ -19,7 +19,6 @@
package org.apache.felix.sigil.eclipse.internal.repository.eclipse;
-
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
@@ -49,91 +48,93 @@ public class WorkspaceRepository extends
{
private static final int UPDATE_MASK = IResourceDelta.CONTENT | IResourceDelta.OPEN;
-
- static final int EVENT_MASKS = IResourceChangeEvent.PRE_DELETE | IResourceChangeEvent.POST_CHANGE | IResourceChangeEvent.PRE_REFRESH;
- public WorkspaceRepository( String id )
+ static final int EVENT_MASKS = IResourceChangeEvent.PRE_DELETE
+ | IResourceChangeEvent.POST_CHANGE | IResourceChangeEvent.PRE_REFRESH;
+
+ public WorkspaceRepository(String id)
{
- super( id );
- }
-
-
+ super(id);
+ }
+
@Override
- public void accept( IRepositoryVisitor visitor, int options )
+ public void accept(IRepositoryVisitor visitor, int options)
{
List<ISigilProjectModel> models = SigilCore.getRoot().getProjects();
- for ( ISigilProjectModel project : models )
+ for (ISigilProjectModel project : models)
{
ISigilBundle b = project.getBundle();
- if ( b == null )
+ if (b == null)
{
- SigilCore.error( "No bundle found for project " + project.getProject().getName() );
+ SigilCore.error("No bundle found for project "
+ + project.getProject().getName());
}
else
{
- if ( (options & ResolutionConfig.COMPILE_TIME) != 0 ) {
+ if ((options & ResolutionConfig.COMPILE_TIME) != 0)
+ {
b = compileTimeFilter(project, b);
}
- visitor.visit( b );
+ visitor.visit(b);
}
}
}
-
private ISigilBundle compileTimeFilter(ISigilProjectModel project, ISigilBundle bundle)
{
bundle = (ISigilBundle) bundle.clone();
Collection<String> packages = findPackages(project);
-
- for ( IPackageExport pe : bundle.getBundleInfo().getExports() ) {
+
+ for (IPackageExport pe : bundle.getBundleInfo().getExports())
+ {
final String packagePath = pe.getPackageName().replace('.', '/');
- if ( !packages.contains(packagePath) ) {
+ if (!packages.contains(packagePath))
+ {
bundle.getBundleInfo().removeExport(pe);
}
}
-
+
return bundle;
}
-
-
private Collection<String> findPackages(ISigilProjectModel project)
{
final IContentTypeManager contentTypeManager = Platform.getContentTypeManager();
final IContentType javaContentType = contentTypeManager.getContentType("org.eclipse.jdt.core.javaSource");
final HashSet<String> packages = new HashSet<String>();
-
+
try
{
project.getProject().accept(new IResourceVisitor()
{
public boolean visit(IResource resource) throws CoreException
{
- if ( resource instanceof IFile ) {
+ if (resource instanceof IFile)
+ {
IFile f = (IFile) resource;
IContentType ct = contentTypeManager.findContentTypeFor(f.getName());
- if ( ct != null && ct.isKindOf(javaContentType) ) {
+ if (ct != null && ct.isKindOf(javaContentType))
+ {
IPath p = f.getProjectRelativePath();
p = p.removeLastSegments(1);
p = p.removeFirstSegments(1);
- packages.add( p.toString() );
+ packages.add(p.toString());
}
}
-
+
return true;
}
});
}
catch (CoreException e)
{
- SigilCore.error( "Failed to read packages for " + project.getProject().getName() );
+ SigilCore.error("Failed to read packages for "
+ + project.getProject().getName());
}
-
- return packages;
- }
-
+ return packages;
+ }
public void refresh()
{
@@ -143,11 +144,12 @@ public class WorkspaceRepository extends
// potential performance improvement in future?
}
- public void resourceChanged( IResourceChangeEvent event )
+ public void resourceChanged(IResourceChangeEvent event)
{
try
{
- switch (event.getType()) {
+ switch (event.getType())
+ {
case IResourceChangeEvent.PRE_DELETE:
handleDelete(event);
break;
@@ -159,9 +161,9 @@ public class WorkspaceRepository extends
break;
}
}
- catch ( CoreException e )
+ catch (CoreException e)
{
- SigilCore.error( "Workspace repository update failed", e );
+ SigilCore.error("Workspace repository update failed", e);
}
}
@@ -169,21 +171,22 @@ public class WorkspaceRepository extends
private void handleDelete(IResourceChangeEvent event)
{
- if ( event.getResource() instanceof IProject ) {
+ if (event.getResource() instanceof IProject)
+ {
IProject project = (IProject) event.getResource();
- if ( isSigilProject(project) )
+ if (isSigilProject(project))
{
deleted.add(project);
}
}
}
-
private void handleRefresh(IResourceChangeEvent event)
{
- if ( event.getResource() instanceof IProject ) {
+ if (event.getResource() instanceof IProject)
+ {
IProject project = (IProject) event.getResource();
- if ( isSigilProject(project) )
+ if (isSigilProject(project))
{
SigilCore.log("Refreshing workspace repository");
notifyChange();
@@ -191,28 +194,27 @@ public class WorkspaceRepository extends
}
}
-
private void handleChange(IResourceChangeEvent event) throws CoreException
{
final boolean[] notify = new boolean[1];
-
- event.getDelta().accept( new IResourceDeltaVisitor()
+
+ event.getDelta().accept(new IResourceDeltaVisitor()
{
- public boolean visit( IResourceDelta delta ) throws CoreException
+ public boolean visit(IResourceDelta delta) throws CoreException
{
boolean checkMembers = true;
IResource resource = delta.getResource();
- if ( resource instanceof IProject )
+ if (resource instanceof IProject)
{
- IProject project = ( IProject ) resource;
- if ( isSigilProject(project) )
+ IProject project = (IProject) resource;
+ if (isSigilProject(project))
{
- switch ( delta.getKind() )
+ switch (delta.getKind())
{
case IResourceDelta.CHANGED:
int flag = delta.getFlags();
- if ( ( flag & UPDATE_MASK ) == 0 )
+ if ((flag & UPDATE_MASK) == 0)
{
break;
}
@@ -230,9 +232,9 @@ public class WorkspaceRepository extends
checkMembers = false;
}
}
- else if ( resource.getName().equals( SigilCore.SIGIL_PROJECT_FILE ) )
+ else if (resource.getName().equals(SigilCore.SIGIL_PROJECT_FILE))
{
- switch ( delta.getKind() )
+ switch (delta.getKind())
{
case IResourceDelta.CHANGED:
case IResourceDelta.ADDED:
@@ -243,17 +245,17 @@ public class WorkspaceRepository extends
}
return checkMembers && !notify[0];
}
- } );
-
- if (notify[0]) {
+ });
+
+ if (notify[0])
+ {
notifyChange();
}
}
-
private boolean isSigilProject(IProject project)
{
- return SigilCore.isSigilProject( project ) || deleted.remove(project);
+ return SigilCore.isSigilProject(project) || deleted.remove(project);
}
}
Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepositoryProvider.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepositoryProvider.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepositoryProvider.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepositoryProvider.java Mon Aug 2 17:08:03 2010
@@ -19,31 +19,28 @@
package org.apache.felix.sigil.eclipse.internal.repository.eclipse;
-
import java.util.Properties;
import org.apache.felix.sigil.common.repository.IBundleRepository;
import org.apache.felix.sigil.common.repository.IRepositoryProvider;
import org.eclipse.core.resources.ResourcesPlugin;
-
public class WorkspaceRepositoryProvider implements IRepositoryProvider
{
private static WorkspaceRepository repository;
-
public static WorkspaceRepository getWorkspaceRepository()
{
return repository;
}
-
- public IBundleRepository createRepository( String id, Properties preferences )
+ public IBundleRepository createRepository(String id, Properties preferences)
{
- if ( repository == null )
+ if (repository == null)
{
- repository = new WorkspaceRepository( id );
- ResourcesPlugin.getWorkspace().addResourceChangeListener( repository, WorkspaceRepository.EVENT_MASKS );
+ repository = new WorkspaceRepository(id);
+ ResourcesPlugin.getWorkspace().addResourceChangeListener(repository,
+ WorkspaceRepository.EVENT_MASKS);
}
return repository;
}
Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/resources/ProjectResourceListener.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/resources/ProjectResourceListener.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/resources/ProjectResourceListener.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/resources/ProjectResourceListener.java Mon Aug 2 17:08:03 2010
@@ -34,6 +34,7 @@ import org.eclipse.core.resources.IResou
import org.eclipse.core.resources.IResourceDeltaVisitor;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
+
//import org.eclipse.core.runtime.IProgressMonitor;
//import org.eclipse.core.runtime.IStatus;
//import org.eclipse.core.runtime.Status;
@@ -41,7 +42,8 @@ import org.eclipse.core.runtime.CoreExce
public class ProjectResourceListener implements IResourceChangeListener
{
- public static final int EVENT_MASKS = IResourceChangeEvent.PRE_DELETE | IResourceChangeEvent.POST_CHANGE;
+ public static final int EVENT_MASKS = IResourceChangeEvent.PRE_DELETE
+ | IResourceChangeEvent.POST_CHANGE;
private final SigilProjectManager projectManager;
public ProjectResourceListener(SigilProjectManager projectManager)
@@ -49,11 +51,12 @@ public class ProjectResourceListener imp
this.projectManager = projectManager;
}
- public void resourceChanged( IResourceChangeEvent event )
+ public void resourceChanged(IResourceChangeEvent event)
{
try
{
- switch ( event.getType() ) {
+ switch (event.getType())
+ {
case IResourceChangeEvent.PRE_REFRESH:
handleRefresh(event);
break;
@@ -64,40 +67,43 @@ public class ProjectResourceListener imp
handlePostChange(event);
break;
}
-
+
handleUpdate();
}
catch (CoreException e)
{
- SigilCore.error( "Failed to process resource change", e );
+ SigilCore.error("Failed to process resource change", e);
}
}
private void handleUpdate()
{
- if( capabilities.size() > 0 ) {
- final LinkedList<ICapabilityModelElement> changes = new LinkedList<ICapabilityModelElement>(capabilities);
+ if (capabilities.size() > 0)
+ {
+ final LinkedList<ICapabilityModelElement> changes = new LinkedList<ICapabilityModelElement>(
+ capabilities);
capabilities.clear();
-
- ResolveProjectsJob job = new ResolveProjectsJob(ResourcesPlugin.getWorkspace(), changes);
- job.schedule();
+
+ ResolveProjectsJob job = new ResolveProjectsJob(
+ ResourcesPlugin.getWorkspace(), changes);
+ job.schedule();
}
}
-
+
private void handleRefresh(IResourceChangeEvent event) throws CoreException
{
IResourceDelta delta = event.getDelta();
- if ( delta != null )
+ if (delta != null)
{
- delta.accept( new IResourceDeltaVisitor()
+ delta.accept(new IResourceDeltaVisitor()
{
- public boolean visit( IResourceDelta delta ) throws CoreException
+ public boolean visit(IResourceDelta delta) throws CoreException
{
IResource resource = delta.getResource();
- if ( resource instanceof IProject )
+ if (resource instanceof IProject)
{
- IProject project = ( IProject ) resource;
- if ( SigilCore.isSigilProject( project ) )
+ IProject project = (IProject) resource;
+ if (SigilCore.isSigilProject(project))
{
readCapabilities(project);
}
@@ -106,28 +112,28 @@ public class ProjectResourceListener imp
}
return true;
}
- } );
+ });
}
- }
+ }
private LinkedList<ICapabilityModelElement> capabilities = new LinkedList<ICapabilityModelElement>();
-
+
private void handlePostChange(IResourceChangeEvent event) throws CoreException
{
IResourceDelta delta = event.getDelta();
- if ( delta != null )
+ if (delta != null)
{
- delta.accept( new IResourceDeltaVisitor()
+ delta.accept(new IResourceDeltaVisitor()
{
- public boolean visit( IResourceDelta delta ) throws CoreException
+ public boolean visit(IResourceDelta delta) throws CoreException
{
IResource resource = delta.getResource();
- if ( resource instanceof IProject )
+ if (resource instanceof IProject)
{
- IProject project = ( IProject ) resource;
- if ( SigilCore.isSigilProject( project ) )
+ IProject project = (IProject) resource;
+ if (SigilCore.isSigilProject(project))
{
- switch ( delta.getKind() )
+ switch (delta.getKind())
{
case IResourceDelta.REMOVED:
case IResourceDelta.ADDED:
@@ -140,17 +146,17 @@ public class ProjectResourceListener imp
}
return true;
}
- } );
+ });
}
}
protected void handlePreDelete(IResourceChangeEvent event) throws CoreException
{
IResource resource = event.getResource();
- if ( resource instanceof IProject )
+ if (resource instanceof IProject)
{
- IProject project = ( IProject ) resource;
- if ( SigilCore.isSigilProject( project ) )
+ IProject project = (IProject) resource;
+ if (SigilCore.isSigilProject(project))
{
readCapabilities(project);
projectManager.flushSigilProject(project);
@@ -162,10 +168,11 @@ public class ProjectResourceListener imp
{
ISigilProjectModel sigil = SigilCore.create(project);
sigil.visit(new IModelWalker()
- {
+ {
public boolean visit(IModelElement element)
{
- if ( element instanceof ICapabilityModelElement ) {
+ if (element instanceof ICapabilityModelElement)
+ {
capabilities.add((ICapabilityModelElement) element);
}
return true;
Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/resources/SigilProjectManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/resources/SigilProjectManager.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/resources/SigilProjectManager.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/resources/SigilProjectManager.java Mon Aug 2 17:08:03 2010
@@ -28,28 +28,34 @@ import org.eclipse.core.runtime.CoreExce
public class SigilProjectManager
{
private static HashMap<IProject, SigilProject> projects = new HashMap<IProject, SigilProject>();
-
- public SigilProject getSigilProject(IProject project) throws CoreException {
- if ( project.hasNature( SigilCore.NATURE_ID ) )
+
+ public SigilProject getSigilProject(IProject project) throws CoreException
+ {
+ if (project.hasNature(SigilCore.NATURE_ID))
{
SigilProject p = null;
- synchronized( projects ) {
+ synchronized (projects)
+ {
p = projects.get(project);
- if ( p == null ) {
- p = new SigilProject( project );
- projects.put(project, p);
+ if (p == null)
+ {
+ p = new SigilProject(project);
+ projects.put(project, p);
}
}
- return p;
+ return p;
}
else
{
- throw SigilCore.newCoreException( "Project " + project.getName() + " is not a sigil project", null );
+ throw SigilCore.newCoreException("Project " + project.getName()
+ + " is not a sigil project", null);
}
}
-
- public void flushSigilProject(IProject project) {
- synchronized(project) {
+
+ public void flushSigilProject(IProject project)
+ {
+ synchronized (project)
+ {
projects.remove(project);
}
}
Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/job/ResolveProjectsJob.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/job/ResolveProjectsJob.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/job/ResolveProjectsJob.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/job/ResolveProjectsJob.java Mon Aug 2 17:08:03 2010
@@ -19,7 +19,6 @@
package org.apache.felix.sigil.eclipse.job;
-
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedList;
@@ -38,32 +37,31 @@ import org.eclipse.core.runtime.IProgres
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.MultiStatus;
-
public class ResolveProjectsJob extends WorkspaceJob
{
private final Collection<ISigilProjectModel> sigilProjects;
private final LinkedList<ICapabilityModelElement> capabilities;
-
- public ResolveProjectsJob( IWorkspace workspace )
+
+ public ResolveProjectsJob(IWorkspace workspace)
{
- super( "Resolving Sigil projects" );
- setRule( workspace.getRoot() );
+ super("Resolving Sigil projects");
+ setRule(workspace.getRoot());
sigilProjects = SigilCore.getRoot().getProjects();
capabilities = null;
}
public ResolveProjectsJob(IWorkspace workspace, LinkedList<ICapabilityModelElement> capabilities)
{
- super( "Resolving Sigil projects" );
+ super("Resolving Sigil projects");
this.capabilities = capabilities;
- setRule( workspace.getRoot() );
+ setRule(workspace.getRoot());
sigilProjects = SigilCore.getRoot().getProjects();
}
public ResolveProjectsJob(ISigilProjectModel project)
{
- super( "Resolving Sigil project" );
- setRule( project.getProject().getWorkspace().getRoot() );
+ super("Resolving Sigil project");
+ setRule(project.getProject().getWorkspace().getRoot());
sigilProjects = Collections.singleton(project);
capabilities = null;
}
@@ -71,22 +69,25 @@ public class ResolveProjectsJob extends
@Override
public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException
{
- MultiStatus status = new MultiStatus( SigilCore.PLUGIN_ID, 0, "Error resolving Sigil projects", null );
+ MultiStatus status = new MultiStatus(SigilCore.PLUGIN_ID, 0,
+ "Error resolving Sigil projects", null);
boolean flush = sigilProjects.size() > 0;
-
- for ( ISigilProjectModel sigilProject : sigilProjects )
+
+ for (ISigilProjectModel sigilProject : sigilProjects)
{
try
{
- if ( isDependent(sigilProject) ) {
- if ( flush) sigilProject.flushDependencyState();
+ if (isDependent(sigilProject))
+ {
+ if (flush)
+ sigilProject.flushDependencyState();
sigilProject.rebuildDependencies(monitor);
}
}
- catch ( CoreException e )
+ catch (CoreException e)
{
- status.add( e.getStatus() );
+ status.add(e.getStatus());
}
}
@@ -95,27 +96,34 @@ public class ResolveProjectsJob extends
private boolean isDependent(ISigilProjectModel sigilProject)
{
- if ( capabilities == null ) {
+ if (capabilities == null)
+ {
return true;
}
- else {
+ else
+ {
ISigilBundle b = sigilProject.getBundle();
- if ( b == null ) {
+ if (b == null)
+ {
// sigil project deleted can't be a dependent
return false;
}
- else {
+ else
+ {
final boolean[] dep = new boolean[1];
-
+
b.visit(new IModelWalker()
{
public boolean visit(IModelElement element)
{
- if (element instanceof IRequirementModelElement) {
+ if (element instanceof IRequirementModelElement)
+ {
IRequirementModelElement r = (IRequirementModelElement) element;
-
- for (ICapabilityModelElement c : capabilities) {
- if( r.accepts(c)) {
+
+ for (ICapabilityModelElement c : capabilities)
+ {
+ if (r.accepts(c))
+ {
dep[0] = true;
break;
}
@@ -125,7 +133,7 @@ public class ResolveProjectsJob extends
return !dep[0];
}
});
-
+
return dep[0];
}
}
Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/job/ThreadProgressMonitor.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/job/ThreadProgressMonitor.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/job/ThreadProgressMonitor.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/job/ThreadProgressMonitor.java Mon Aug 2 17:08:03 2010
@@ -19,21 +19,17 @@
package org.apache.felix.sigil.eclipse.job;
-
import org.eclipse.core.runtime.IProgressMonitor;
-
public class ThreadProgressMonitor
{
private static ThreadLocal<IProgressMonitor> local = new ThreadLocal<IProgressMonitor>();
-
- public static void setProgressMonitor( IProgressMonitor monitor )
+ public static void setProgressMonitor(IProgressMonitor monitor)
{
- local.set( monitor );
+ local.set(monitor);
}
-
public static IProgressMonitor getProgressMonitor()
{
return local.get();
Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/project/ISigilModelRoot.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/project/ISigilModelRoot.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/project/ISigilModelRoot.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/project/ISigilModelRoot.java Mon Aug 2 17:08:03 2010
@@ -19,7 +19,6 @@
package org.apache.felix.sigil.eclipse.model.project;
-
import java.util.Collection;
import java.util.List;
import java.util.Set;
@@ -30,15 +29,14 @@ import org.apache.felix.sigil.common.mod
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
-
public interface ISigilModelRoot
{
List<ISigilProjectModel> getProjects();
+ Set<ISigilProjectModel> resolveDependentProjects(
+ Collection<ICapabilityModelElement> caps, IProgressMonitor monitor);
- Set<ISigilProjectModel> resolveDependentProjects( Collection<ICapabilityModelElement> caps, IProgressMonitor monitor );
-
-
- Collection<ISigilBundle> resolveBundles( ISigilProjectModel sigil, IModelElement element, boolean includeOptional,
- IProgressMonitor monitor ) throws CoreException;
+ Collection<ISigilBundle> resolveBundles(ISigilProjectModel sigil,
+ IModelElement element, boolean includeOptional, IProgressMonitor monitor)
+ throws CoreException;
}
Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/project/ISigilProjectModel.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/project/ISigilProjectModel.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/project/ISigilProjectModel.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/project/ISigilProjectModel.java Mon Aug 2 17:08:03 2010
@@ -19,10 +19,8 @@
package org.apache.felix.sigil.eclipse.model.project;
-
import java.util.Collection;
-
import org.apache.felix.sigil.common.config.IBldProject;
import org.apache.felix.sigil.common.core.BldCore;
import org.apache.felix.sigil.common.model.ICompoundModelElement;
@@ -39,7 +37,6 @@ import org.eclipse.jdt.core.JavaModelExc
import org.osgi.framework.Version;
import org.osgi.service.prefs.Preferences;
-
/**
* Represents a sigil project. To get a reference to a ISigilProjectModel you can use the
* helper method {@link BldCore#create(IProject)}.
@@ -55,14 +52,11 @@ public interface ISigilProjectModel exte
*/
IProject getProject();
-
// shortcut to getProject().getName()
String getName();
-
Preferences getPreferences();
-
/**
*
* @param monitor
@@ -73,64 +67,52 @@ public interface ISigilProjectModel exte
* @throws CoreException
*/
void save(IProgressMonitor monitor) throws CoreException;
-
+
/**
* Save the project and optionally rebuildDependencies
* @param monitor
* @param rebuildDependencies
* @throws CoreException
*/
- void save( IProgressMonitor monitor, boolean rebuildDependencies ) throws CoreException;
-
+ void save(IProgressMonitor monitor, boolean rebuildDependencies) throws CoreException;
+
void rebuildDependencies(IProgressMonitor monitor) throws CoreException;
-
- void flushDependencyState();
+ void flushDependencyState();
/**
* @return
*/
Version getVersion();
-
String getSymbolicName();
-
ISigilBundle getBundle();
-
- void setBundle( ISigilBundle bundle );
-
+ void setBundle(ISigilBundle bundle);
/**
* @return
*/
IJavaProject getJavaModel();
-
- void resetClasspath( IProgressMonitor monitor ) throws CoreException;
-
+ void resetClasspath(IProgressMonitor monitor) throws CoreException;
IPath findBundleLocation() throws CoreException;
+ IModelElement findImport(String packageName, IProgressMonitor monitor);
- IModelElement findImport( String packageName, IProgressMonitor monitor );
-
-
- boolean isInClasspath( String packageName, IProgressMonitor monitor ) throws CoreException;
+ boolean isInClasspath(String packageName, IProgressMonitor monitor)
+ throws CoreException;
+ boolean isInClasspath(ISigilBundle bundle);
- boolean isInClasspath( ISigilBundle bundle );
-
-
- boolean isInBundleClasspath( IPackageFragment root ) throws JavaModelException;
-
+ boolean isInBundleClasspath(IPackageFragment root) throws JavaModelException;
IPath findOutputLocation() throws CoreException;
-
IBldProject getBldProject() throws CoreException;
-
- Collection<IClasspathEntry> findExternalClasspath( IProgressMonitor monitor ) throws CoreException;
+ Collection<IClasspathEntry> findExternalClasspath(IProgressMonitor monitor)
+ throws CoreException;
}
Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryConfiguration.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryConfiguration.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryConfiguration.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryConfiguration.java Mon Aug 2 17:08:03 2010
@@ -19,43 +19,32 @@
package org.apache.felix.sigil.eclipse.model.repository;
-
import java.util.List;
import java.util.Map;
import org.apache.felix.sigil.eclipse.internal.model.repository.RepositoryType;
import org.eclipse.core.runtime.CoreException;
-
public interface IRepositoryConfiguration
{
List<IRepositoryModel> loadRepositories();
+ IRepositoryModel findRepository(String id);
- IRepositoryModel findRepository( String id );
-
-
- void saveRepositories( List<IRepositoryModel> repositories ) throws CoreException;
-
+ void saveRepositories(List<IRepositoryModel> repositories) throws CoreException;
List<RepositoryType> loadRepositoryTypes();
-
- IRepositoryModel newRepositoryElement( IRepositoryType type );
-
+ IRepositoryModel newRepositoryElement(IRepositoryType type);
IRepositorySet getDefaultRepositorySet();
+ void setDefaultRepositorySet(IRepositorySet defaultSet);
- void setDefaultRepositorySet( IRepositorySet defaultSet );
-
-
- IRepositorySet getRepositorySet( String name );
-
+ IRepositorySet getRepositorySet(String name);
Map<String, IRepositorySet> loadRepositorySets();
-
- void saveRepositorySets( Map<String, IRepositorySet> sets );
+ void saveRepositorySets(Map<String, IRepositorySet> sets);
}
\ No newline at end of file
Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryModel.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryModel.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryModel.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryModel.java Mon Aug 2 17:08:03 2010
@@ -19,24 +19,18 @@
package org.apache.felix.sigil.eclipse.model.repository;
-
import org.eclipse.jface.preference.PreferenceStore;
-
public interface IRepositoryModel
{
String getId();
-
- void setName( String stringValue );
-
+ void setName(String stringValue);
String getName();
-
PreferenceStore getPreferences();
-
IRepositoryType getType();
}
\ No newline at end of file
Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositorySet.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositorySet.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositorySet.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositorySet.java Mon Aug 2 17:08:03 2010
@@ -19,17 +19,13 @@
package org.apache.felix.sigil.eclipse.model.repository;
-
public interface IRepositorySet
{
- void setRepository( IRepositoryModel id, int position );
-
-
- void removeRepository( IRepositoryModel id );
+ void setRepository(IRepositoryModel id, int position);
+ void removeRepository(IRepositoryModel id);
IRepositoryModel[] getRepositories();
-
- void setRepositories( IRepositoryModel[] repositories );
+ void setRepositories(IRepositoryModel[] repositories);
}
Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryType.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryType.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryType.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryType.java Mon Aug 2 17:08:03 2010
@@ -19,22 +19,17 @@
package org.apache.felix.sigil.eclipse.model.repository;
-
import org.eclipse.swt.graphics.Image;
-
public interface IRepositoryType
{
String getType();
-
String getId();
-
Image getIcon();
-
boolean isDynamic();
}
\ No newline at end of file
Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/repository/RepositorySet.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/repository/RepositorySet.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/repository/RepositorySet.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/repository/RepositorySet.java Mon Aug 2 17:08:03 2010
@@ -19,11 +19,9 @@
package org.apache.felix.sigil.eclipse.model.repository;
-
import java.util.ArrayList;
import java.util.Collection;
-
public class RepositorySet implements IRepositorySet
{
@@ -31,49 +29,42 @@ public class RepositorySet implements IR
private IRepositoryModel[] reps;
-
public RepositorySet()
{
- this( EMPTY );
+ this(EMPTY);
}
-
- public RepositorySet( Collection<IRepositoryModel> reps )
+ public RepositorySet(Collection<IRepositoryModel> reps)
{
- this( reps.toArray( new IRepositoryModel[reps.size()] ) );
+ this(reps.toArray(new IRepositoryModel[reps.size()]));
}
-
- public RepositorySet( IRepositoryModel[] repositories )
+ public RepositorySet(IRepositoryModel[] repositories)
{
this.reps = repositories;
}
-
- public void setRepository( IRepositoryModel id, int position )
+ public void setRepository(IRepositoryModel id, int position)
{
- ArrayList<IRepositoryModel> tmp = new ArrayList<IRepositoryModel>( reps.length + 1 );
- tmp.remove( id );
- tmp.add( position, id );
- reps = tmp.toArray( new IRepositoryModel[tmp.size()] );
+ ArrayList<IRepositoryModel> tmp = new ArrayList<IRepositoryModel>(reps.length + 1);
+ tmp.remove(id);
+ tmp.add(position, id);
+ reps = tmp.toArray(new IRepositoryModel[tmp.size()]);
}
-
public IRepositoryModel[] getRepositories()
{
return reps;
}
-
- public void removeRepository( IRepositoryModel id )
+ public void removeRepository(IRepositoryModel id)
{
- ArrayList<IRepositoryModel> tmp = new ArrayList<IRepositoryModel>( reps.length + 1 );
- tmp.remove( id );
- reps = tmp.toArray( new IRepositoryModel[tmp.size()] );
+ ArrayList<IRepositoryModel> tmp = new ArrayList<IRepositoryModel>(reps.length + 1);
+ tmp.remove(id);
+ reps = tmp.toArray(new IRepositoryModel[tmp.size()]);
}
-
- public void setRepositories( IRepositoryModel[] repositories )
+ public void setRepositories(IRepositoryModel[] repositories)
{
reps = repositories == null ? EMPTY : repositories;
}