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 [19/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/ui/src/org/apache/felix/sigil/eclipse/ui/internal/repository/OSGiInstallRepositoryWizardPage.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/repository/OSGiInstallRepositoryWizardPage.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/repository/OSGiInstallRepositoryWizardPage.java (original)
+++ felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/repository/OSGiInstallRepositoryWizardPage.java Mon Aug 2 17:08:03 2010
@@ -19,7 +19,6 @@
package org.apache.felix.sigil.eclipse.ui.internal.repository;
-
import java.util.ArrayList;
import org.apache.felix.sigil.eclipse.SigilCore;
@@ -28,31 +27,29 @@ import org.apache.felix.sigil.eclipse.ui
import org.apache.felix.sigil.eclipse.ui.wizard.repository.RepositoryWizardPage;
import org.eclipse.jface.preference.RadioGroupFieldEditor;
-
public class OSGiInstallRepositoryWizardPage extends RepositoryWizardPage
{
- protected OSGiInstallRepositoryWizardPage( RepositoryWizard parent )
+ protected OSGiInstallRepositoryWizardPage(RepositoryWizard parent)
{
- super( "OSGi Install Repository", parent );
+ super("OSGi Install Repository", parent);
}
-
@Override
public void createFieldEditors()
{
ArrayList<String[]> installs = new ArrayList<String[]>();
- for ( String id : SigilCore.getInstallManager().getInstallIDs() )
+ for (String id : SigilCore.getInstallManager().getInstallIDs())
{
- IOSGiInstall i = SigilCore.getInstallManager().findInstall( id );
- installs.add( new String[]
- { i.getType().getName(), id } );
+ IOSGiInstall i = SigilCore.getInstallManager().findInstall(id);
+ installs.add(new String[] { i.getType().getName(), id });
}
- String[][] strs = installs.toArray( new String[installs.size()][] );
+ String[][] strs = installs.toArray(new String[installs.size()][]);
- RadioGroupFieldEditor editor = new RadioGroupFieldEditor( "id", "Install", 1, strs, getFieldEditorParent() );
+ RadioGroupFieldEditor editor = new RadioGroupFieldEditor("id", "Install", 1,
+ strs, getFieldEditorParent());
- addField( editor );
+ addField(editor);
}
}
Modified: felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/startup/SigilStartup.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/startup/SigilStartup.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/startup/SigilStartup.java (original)
+++ felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/startup/SigilStartup.java Mon Aug 2 17:08:03 2010
@@ -19,7 +19,6 @@
package org.apache.felix.sigil.eclipse.ui.internal.startup;
-
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.felix.sigil.common.repository.IRepositoryChangeListener;
@@ -35,43 +34,47 @@ import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.ui.IStartup;
-
public class SigilStartup implements IStartup
{
public void earlyStartup()
{
final AtomicInteger updateCounter = new AtomicInteger();
-
+
// Register a repository change listener to re-run the resolver when repository changes
- SigilCore.getGlobalRepositoryManager().addRepositoryChangeListener( new IRepositoryChangeListener()
- {
- public void repositoryChanged( RepositoryChangeEvent event )
+ SigilCore.getGlobalRepositoryManager().addRepositoryChangeListener(
+ new IRepositoryChangeListener()
{
- if ( !SigilUI.WORKSPACE_REPOSITORY_ID.equals( event.getRepository().getId() ) ) {
- final int update = updateCounter.incrementAndGet();
-
- Job job = new Job("Pending repository update") {
- @Override
- protected IStatus run(IProgressMonitor monitor)
+ public void repositoryChanged(RepositoryChangeEvent event)
+ {
+ if (!SigilUI.WORKSPACE_REPOSITORY_ID.equals(event.getRepository().getId()))
+ {
+ final int update = updateCounter.incrementAndGet();
+
+ Job job = new Job("Pending repository update")
{
- if ( update == updateCounter.get() ) {
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- ResolveProjectsJob job = new ResolveProjectsJob( workspace );
- job.setSystem( true );
- job.schedule();
+ @Override
+ protected IStatus run(IProgressMonitor monitor)
+ {
+ if (update == updateCounter.get())
+ {
+ IWorkspace workspace = ResourcesPlugin.getWorkspace();
+ ResolveProjectsJob job = new ResolveProjectsJob(
+ workspace);
+ job.setSystem(true);
+ job.schedule();
+ }
+ return Status.OK_STATUS;
}
- return Status.OK_STATUS;
- }
-
- };
- job.setSystem(true);
- job.schedule(100);
- }
- //else {
- // Repository changes are handled by ProjectResourceListener
- //}
- }
- } );
+
+ };
+ job.setSystem(true);
+ job.schedule(100);
+ }
+ //else {
+ // Repository changes are handled by ProjectResourceListener
+ //}
+ }
+ });
}
}
Modified: felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/ModelElementComparator.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/ModelElementComparator.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/ModelElementComparator.java (original)
+++ felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/ModelElementComparator.java Mon Aug 2 17:08:03 2010
@@ -19,7 +19,6 @@
package org.apache.felix.sigil.eclipse.ui.internal.views;
-
import org.apache.felix.sigil.common.model.osgi.IPackageExport;
import org.apache.felix.sigil.common.model.osgi.IPackageImport;
import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
@@ -29,7 +28,6 @@ import org.eclipse.jface.viewers.ILabelP
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerComparator;
-
public class ModelElementComparator extends ViewerComparator
{
private static final int EXPORT_GROUP = 0;
@@ -37,18 +35,17 @@ public class ModelElementComparator exte
private static final int REQUIRE_GROUP = 2;
private static final int OTHER_GROUP = 4;
-
- public int category( Object element )
+ public int category(Object element)
{
- if ( element instanceof IPackageImport )
+ if (element instanceof IPackageImport)
{
return IMPORT_GROUP;
}
- else if ( element instanceof IPackageExport )
+ else if (element instanceof IPackageExport)
{
return EXPORT_GROUP;
}
- else if ( element instanceof IRequiredBundle )
+ else if (element instanceof IRequiredBundle)
{
return REQUIRE_GROUP;
}
@@ -58,37 +55,36 @@ public class ModelElementComparator exte
}
}
-
@SuppressWarnings("unchecked")
@Override
- public int compare( Viewer viewer, Object e1, Object e2 )
+ public int compare(Viewer viewer, Object e1, Object e2)
{
- int cat1 = category( e1 );
- int cat2 = category( e2 );
+ int cat1 = category(e1);
+ int cat2 = category(e2);
- if ( cat1 != cat2 )
+ if (cat1 != cat2)
{
return cat1 - cat2;
}
- if ( cat1 == OTHER_GROUP )
+ if (cat1 == OTHER_GROUP)
{
String name1;
String name2;
- if ( viewer == null || !( viewer instanceof ContentViewer ) )
+ if (viewer == null || !(viewer instanceof ContentViewer))
{
name1 = e1.toString();
name2 = e2.toString();
}
else
{
- IBaseLabelProvider prov = ( ( ContentViewer ) viewer ).getLabelProvider();
- if ( prov instanceof ILabelProvider )
+ IBaseLabelProvider prov = ((ContentViewer) viewer).getLabelProvider();
+ if (prov instanceof ILabelProvider)
{
- ILabelProvider lprov = ( ILabelProvider ) prov;
- name1 = lprov.getText( e1 );
- name2 = lprov.getText( e2 );
+ ILabelProvider lprov = (ILabelProvider) prov;
+ name1 = lprov.getText(e1);
+ name2 = lprov.getText(e2);
}
else
{
@@ -96,23 +92,23 @@ public class ModelElementComparator exte
name2 = e2.toString();
}
}
- if ( name1 == null )
+ if (name1 == null)
{
name1 = "";//$NON-NLS-1$
}
- if ( name2 == null )
+ if (name2 == null)
{
name2 = "";//$NON-NLS-1$
}
// use the comparator to compare the strings
- return getComparator().compare( name1, name2 );
+ return getComparator().compare(name1, name2);
}
else
{
- Comparable c1 = ( Comparable ) e1;
- Comparable c2 = ( Comparable ) e2;
- return c1.compareTo( c2 );
+ Comparable c1 = (Comparable) e1;
+ Comparable c2 = (Comparable) e2;
+ return c1.compareTo(c2);
}
}
}
Modified: felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/RepositoryViewPart.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/RepositoryViewPart.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/RepositoryViewPart.java (original)
+++ felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/RepositoryViewPart.java Mon Aug 2 17:08:03 2010
@@ -19,7 +19,6 @@
package org.apache.felix.sigil.eclipse.ui.internal.views;
-
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -61,7 +60,6 @@ import org.eclipse.ui.ISharedImages;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.part.ViewPart;
-
public class RepositoryViewPart extends ViewPart implements IRepositoryChangeListener
{
@@ -73,35 +71,35 @@ public class RepositoryViewPart extends
return "Find Uses";
}
-
@Override
public void run()
{
ISelection s = treeViewer.getSelection();
- if ( !s.isEmpty() )
+ if (!s.isEmpty())
{
- IStructuredSelection sel = ( IStructuredSelection ) s;
- IModelElement e = ( IModelElement ) sel.getFirstElement();
- List<IModelElement> users = ModelHelper.findUsers( e );
+ IStructuredSelection sel = (IStructuredSelection) s;
+ IModelElement e = (IModelElement) sel.getFirstElement();
+ List<IModelElement> users = ModelHelper.findUsers(e);
String msg = null;
- if ( users.isEmpty() )
+ if (users.isEmpty())
{
msg = "No users of " + e;
}
else
{
StringBuilder b = new StringBuilder();
- for ( IModelElement u : users )
+ for (IModelElement u : users)
{
- ISigilBundle bndl = u.getAncestor( ISigilBundle.class );
- b.append( bndl );
- b.append( "->" );
- b.append( u );
- b.append( "\n" );
+ ISigilBundle bndl = u.getAncestor(ISigilBundle.class);
+ b.append(bndl);
+ b.append("->");
+ b.append(u);
+ b.append("\n");
}
msg = b.toString();
}
- MessageDialog.openInformation( getViewSite().getShell(), "Information", msg );
+ MessageDialog.openInformation(getViewSite().getShell(), "Information",
+ msg);
}
}
}
@@ -111,45 +109,43 @@ public class RepositoryViewPart extends
final IBundleRepository rep;
final IRepositoryModel model;
-
- public RepositoryAction( IBundleRepository rep )
+ public RepositoryAction(IBundleRepository rep)
{
this.rep = rep;
- this.model = SigilCore.getRepositoryConfiguration().findRepository( rep.getId() );
+ this.model = SigilCore.getRepositoryConfiguration().findRepository(
+ rep.getId());
}
-
@Override
public void run()
{
- treeViewer.setInput( rep );
+ treeViewer.setInput(rep);
createMenu();
}
-
@Override
public String getText()
{
String name = model.getName();
- if ( treeViewer.getInput() == rep )
+ if (treeViewer.getInput() == rep)
{
name = "> " + name;
}
return name;
}
-
@Override
public ImageDescriptor getImageDescriptor()
{
Image img = model.getType().getIcon();
- if ( img == null )
+ if (img == null)
{
- return ImageDescriptor.createFromFile( RepositoryViewPart.class, "/icons/repository.gif" );
+ return ImageDescriptor.createFromFile(RepositoryViewPart.class,
+ "/icons/repository.gif");
}
else
{
- return ImageDescriptor.createFromImage( img );
+ return ImageDescriptor.createFromImage(img);
}
}
}
@@ -162,78 +158,72 @@ public class RepositoryViewPart extends
treeViewer.collapseAll();
}
-
@Override
public String getText()
{
return "Collapse All";
}
-
@Override
public ImageDescriptor getImageDescriptor()
{
- return PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_ELCL_COLLAPSEALL);
+ return PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(
+ ISharedImages.IMG_ELCL_COLLAPSEALL);
}
}
-
+
class RefreshAction extends Action
{
@Override
public void run()
{
- IBundleRepository rep = ( IBundleRepository ) treeViewer.getInput();
- if ( rep != null )
+ IBundleRepository rep = (IBundleRepository) treeViewer.getInput();
+ if (rep != null)
{
rep.refresh();
treeViewer.refresh();
}
}
-
@Override
public String getText()
{
return "Refresh";
}
-
@Override
public ImageDescriptor getImageDescriptor()
{
-
- return ImageDescriptor.createFromFile( RepositoryViewPart.class, "/icons/bundle-refresh.gif" );
+
+ return ImageDescriptor.createFromFile(RepositoryViewPart.class,
+ "/icons/bundle-refresh.gif");
}
}
private TreeViewer treeViewer;
-
@Override
- public void createPartControl( Composite parent )
+ public void createPartControl(Composite parent)
{
- createBody( parent );
+ createBody(parent);
createMenu();
- SigilCore.getGlobalRepositoryManager().addRepositoryChangeListener( this );
+ SigilCore.getGlobalRepositoryManager().addRepositoryChangeListener(this);
}
-
@Override
public void dispose()
{
- SigilCore.getGlobalRepositoryManager().removeRepositoryChangeListener( this );
+ SigilCore.getGlobalRepositoryManager().removeRepositoryChangeListener(this);
super.dispose();
}
-
private void createMenu()
{
createTopMenu();
createLocalMenu();
}
-
private void createLocalMenu()
{
/*MenuManager menuMgr = new MenuManager();
@@ -244,183 +234,174 @@ public class RepositoryViewPart extends
getViewSite().registerContextMenu(menuMgr, treeViewer); */
IActionBars bars = getViewSite().getActionBars();
IToolBarManager toolBar = bars.getToolBarManager();
- toolBar.add( new RefreshAction() );
- toolBar.add( new CollapseAction() );
+ toolBar.add(new RefreshAction());
+ toolBar.add(new CollapseAction());
}
-
private void createTopMenu()
{
IActionBars bars = getViewSite().getActionBars();
IMenuManager menu = bars.getMenuManager();
menu.removeAll();
- for ( final IBundleRepository rep : SigilCore.getGlobalRepositoryManager().getRepositories() )
+ for (final IBundleRepository rep : SigilCore.getGlobalRepositoryManager().getRepositories())
{
- if ( treeViewer.getInput() == null )
+ if (treeViewer.getInput() == null)
{
- treeViewer.setInput( rep );
+ treeViewer.setInput(rep);
}
- RepositoryAction action = new RepositoryAction( rep );
- menu.add( action );
+ RepositoryAction action = new RepositoryAction(rep);
+ menu.add(action);
}
}
-
- private void createBody( Composite parent )
+ private void createBody(Composite parent)
{
// components
- Composite control = new Composite( parent, SWT.NONE );
- Tree tree = new Tree( control, SWT.NONE );
+ Composite control = new Composite(parent, SWT.NONE);
+ Tree tree = new Tree(control, SWT.NONE);
// layout
- control.setLayout( new GridLayout( 1, false ) );
- tree.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true, 1, 1 ) );
+ control.setLayout(new GridLayout(1, false));
+ tree.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
// viewer
- treeViewer = new TreeViewer( tree );
- treeViewer.setContentProvider( new DefaultTreeContentProvider()
+ treeViewer = new TreeViewer(tree);
+ treeViewer.setContentProvider(new DefaultTreeContentProvider()
{
- public Object[] getChildren( Object parentElement )
+ public Object[] getChildren(Object parentElement)
{
- if ( parentElement instanceof ICompoundModelElement )
+ if (parentElement instanceof ICompoundModelElement)
{
- ICompoundModelElement model = ( ICompoundModelElement ) parentElement;
+ ICompoundModelElement model = (ICompoundModelElement) parentElement;
return model.children();
}
return null;
}
-
- public Object getParent( Object element )
+ public Object getParent(Object element)
{
- if ( element instanceof IModelElement )
+ if (element instanceof IModelElement)
{
- IModelElement model = ( IModelElement ) element;
+ IModelElement model = (IModelElement) element;
return model.getParent();
}
return null;
}
-
- public boolean hasChildren( Object element )
+ public boolean hasChildren(Object element)
{
- if ( element instanceof ICompoundModelElement )
+ if (element instanceof ICompoundModelElement)
{
- ICompoundModelElement model = ( ICompoundModelElement ) element;
+ ICompoundModelElement model = (ICompoundModelElement) element;
return model.children().length > 0;
}
return false;
}
-
- public Object[] getElements( Object inputElement )
+ public Object[] getElements(Object inputElement)
{
- IBundleRepository rep = ( IBundleRepository ) inputElement;
- return getBundles( rep );
+ IBundleRepository rep = (IBundleRepository) inputElement;
+ return getBundles(rep);
}
- } );
+ });
- treeViewer.setComparator( new ModelElementComparator() );
+ treeViewer.setComparator(new ModelElementComparator());
- treeViewer.setLabelProvider( new ModelLabelProvider() );
+ treeViewer.setLabelProvider(new ModelLabelProvider());
- treeViewer.addDragSupport( DND.DROP_LINK, new Transfer[]
- { LocalSelectionTransfer.getTransfer() }, new DragSourceAdapter()
- {
- @Override
- public void dragFinished( DragSourceEvent event )
- {
- // TODO Auto-generated method stub
- super.dragFinished( event );
- }
-
-
- @Override
- public void dragSetData( DragSourceEvent event )
+ treeViewer.addDragSupport(DND.DROP_LINK,
+ new Transfer[] { LocalSelectionTransfer.getTransfer() },
+ new DragSourceAdapter()
{
- // TODO Auto-generated method stub
- super.dragSetData( event );
- }
+ @Override
+ public void dragFinished(DragSourceEvent event)
+ {
+ // TODO Auto-generated method stub
+ super.dragFinished(event);
+ }
+ @Override
+ public void dragSetData(DragSourceEvent event)
+ {
+ // TODO Auto-generated method stub
+ super.dragSetData(event);
+ }
- @SuppressWarnings("unchecked")
- @Override
- public void dragStart( DragSourceEvent event )
- {
- if ( treeViewer.getSelection().isEmpty() )
+ @SuppressWarnings("unchecked")
+ @Override
+ public void dragStart(DragSourceEvent event)
{
- IStructuredSelection sel = ( IStructuredSelection ) treeViewer.getSelection();
- for ( Iterator<IModelElement> i = sel.iterator(); i.hasNext(); )
+ if (treeViewer.getSelection().isEmpty())
{
- IModelElement e = i.next();
- if ( e instanceof ISigilBundle )
+ IStructuredSelection sel = (IStructuredSelection) treeViewer.getSelection();
+ for (Iterator<IModelElement> i = sel.iterator(); i.hasNext();)
{
- event.data = e;
- }
- else
- {
- event.doit = false;
+ IModelElement e = i.next();
+ if (e instanceof ISigilBundle)
+ {
+ event.data = e;
+ }
+ else
+ {
+ event.doit = false;
+ }
}
}
+ else
+ {
+ event.doit = false;
+ }
}
- else
- {
- event.doit = false;
- }
- }
- } );
+ });
}
-
@Override
public void setFocus()
{
}
-
- public void repositoryChanged( RepositoryChangeEvent event )
+ public void repositoryChanged(RepositoryChangeEvent event)
{
- switch ( event.getType() )
+ switch (event.getType())
{
case ADDED:
createTopMenu();
break;
case CHANGED:
- if ( event.getRepository() == treeViewer.getInput() )
+ if (event.getRepository() == treeViewer.getInput())
{
- SigilUI.runInUI( new Runnable()
+ SigilUI.runInUI(new Runnable()
{
public void run()
{
treeViewer.refresh();
}
- } );
+ });
}
break;
case REMOVED:
- if ( event.getRepository() == treeViewer.getInput() )
+ if (event.getRepository() == treeViewer.getInput())
{
- treeViewer.setInput( null );
+ treeViewer.setInput(null);
}
createTopMenu();
}
}
-
- private Object[] getBundles( IBundleRepository repository )
+ private Object[] getBundles(IBundleRepository repository)
{
final LinkedList<ISigilBundle> bundles = new LinkedList<ISigilBundle>();
- repository.accept( new IRepositoryVisitor()
+ repository.accept(new IRepositoryVisitor()
{
- public boolean visit( ISigilBundle bundle )
+ public boolean visit(ISigilBundle bundle)
{
- bundles.add( bundle );
+ bundles.add(bundle);
return true;
}
- } );
+ });
return bundles.toArray();
}
}
Modified: felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/BundleConnectionHighlighter.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/BundleConnectionHighlighter.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/BundleConnectionHighlighter.java (original)
+++ felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/BundleConnectionHighlighter.java Mon Aug 2 17:08:03 2010
@@ -19,7 +19,6 @@
package org.apache.felix.sigil.eclipse.ui.internal.views.resolution;
-
import java.util.Set;
import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
@@ -32,45 +31,42 @@ import org.eclipse.zest.core.widgets.Gra
import org.eclipse.zest.core.widgets.GraphItem;
import org.eclipse.zest.core.widgets.GraphNode;
-
public class BundleConnectionHighlighter implements ISelectionChangedListener
{
private BundleResolverView view;
-
- public BundleConnectionHighlighter( BundleResolverView view )
+ public BundleConnectionHighlighter(BundleResolverView view)
{
this.view = view;
}
-
- public void selectionChanged( SelectionChangedEvent event )
+ public void selectionChanged(SelectionChangedEvent event)
{
ISelection selection = event.getSelection();
- if ( !selection.isEmpty() )
+ if (!selection.isEmpty())
{
- IStructuredSelection str = ( IStructuredSelection ) selection;
+ IStructuredSelection str = (IStructuredSelection) selection;
Object sel = str.getFirstElement();
- if ( sel instanceof ISigilBundle )
+ if (sel instanceof ISigilBundle)
{
- BundleGraph graph = ( BundleGraph ) view.getBundlegraph();
+ BundleGraph graph = (BundleGraph) view.getBundlegraph();
- ISigilBundle selected = ( ISigilBundle ) sel;
- Set<ISigilBundle> connected = graph.getTargets( selected );
+ ISigilBundle selected = (ISigilBundle) sel;
+ Set<ISigilBundle> connected = graph.getTargets(selected);
- highlightLinks( graph, selected, connected );
- highlightBundles( graph, selected, connected );
+ highlightLinks(graph, selected, connected);
+ highlightBundles(graph, selected, connected);
}
- else if ( sel instanceof Link )
+ else if (sel instanceof Link)
{
- GraphConnection c = ( GraphConnection ) findGraphItem( sel );
- if ( c != null )
+ GraphConnection c = (GraphConnection) findGraphItem(sel);
+ if (c != null)
{
c.unhighlight();
- c.setHighlightColor( ColorConstants.blue );
+ c.setHighlightColor(ColorConstants.blue);
c.highlight();
}
}
@@ -81,26 +77,26 @@ public class BundleConnectionHighlighter
}
}
-
- private void highlightBundles( BundleGraph graph, ISigilBundle selected, Set<ISigilBundle> connected )
+ private void highlightBundles(BundleGraph graph, ISigilBundle selected,
+ Set<ISigilBundle> connected)
{
- for ( ISigilBundle bundle : graph.getBundles() )
+ for (ISigilBundle bundle : graph.getBundles())
{
- GraphNode node = ( GraphNode ) findGraphItem( bundle );
- if ( node != null )
+ GraphNode node = (GraphNode) findGraphItem(bundle);
+ if (node != null)
{
node.unhighlight();
- if ( bundle == selected )
+ if (bundle == selected)
{
- node.setHighlightColor( ColorConstants.yellow );
+ node.setHighlightColor(ColorConstants.yellow);
node.highlight();
}
- else if ( view.isDisplayed( BundleResolverView.DEPENDENTS ) )
+ else if (view.isDisplayed(BundleResolverView.DEPENDENTS))
{
- if ( connected.contains( bundle ) )
+ if (connected.contains(bundle))
{
- node.setHighlightColor( ColorConstants.lightBlue );
+ node.setHighlightColor(ColorConstants.lightBlue);
node.highlight();
}
}
@@ -108,21 +104,21 @@ public class BundleConnectionHighlighter
}
}
-
- private void highlightLinks( BundleGraph graph, ISigilBundle selected, Set<ISigilBundle> connected )
+ private void highlightLinks(BundleGraph graph, ISigilBundle selected,
+ Set<ISigilBundle> connected)
{
- for ( Link l : graph.getLinks() )
+ for (Link l : graph.getLinks())
{
- GraphConnection c = ( GraphConnection ) findGraphItem( l );
- if ( c != null )
+ GraphConnection c = (GraphConnection) findGraphItem(l);
+ if (c != null)
{
c.unhighlight();
- if ( view.isDisplayed( BundleResolverView.DEPENDENTS ) )
+ if (view.isDisplayed(BundleResolverView.DEPENDENTS))
{
- if ( l.getSource() == selected && connected.contains( l.getTarget() ) )
+ if (l.getSource() == selected && connected.contains(l.getTarget()))
{
- c.setHighlightColor( ColorConstants.lightBlue );
+ c.setHighlightColor(ColorConstants.lightBlue);
c.highlight();
}
}
@@ -130,14 +126,13 @@ public class BundleConnectionHighlighter
}
}
-
- private GraphItem findGraphItem( Object l )
+ private GraphItem findGraphItem(Object l)
{
try
{
- return view.getGraphViewer().findGraphItem( l );
+ return view.getGraphViewer().findGraphItem(l);
}
- catch ( ArrayIndexOutOfBoundsException e )
+ catch (ArrayIndexOutOfBoundsException e)
{
// temporary fix for issue
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=242523
Modified: felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/BundleGraph.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/BundleGraph.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/BundleGraph.java (original)
+++ felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/BundleGraph.java Mon Aug 2 17:08:03 2010
@@ -19,7 +19,6 @@
package org.apache.felix.sigil.eclipse.ui.internal.views.resolution;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -31,7 +30,6 @@ import java.util.Set;
import org.apache.felix.sigil.common.model.IModelElement;
import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
-
public class BundleGraph
{
@@ -39,89 +37,82 @@ public class BundleGraph
private LinkedList<Link> links = new LinkedList<Link>();
private HashSet<ISigilBundle> bundles = new HashSet<ISigilBundle>();
-
- public void startResolution( IModelElement requirement )
+ public void startResolution(IModelElement requirement)
{
}
-
- public void endResolution( IModelElement requirement, ISigilBundle target )
+ public void endResolution(IModelElement requirement, ISigilBundle target)
{
- ISigilBundle source = requirement.getAncestor( ISigilBundle.class );
+ ISigilBundle source = requirement.getAncestor(ISigilBundle.class);
- bundles.add( source );
- bundles.add( target );
+ bundles.add(source);
+ bundles.add(target);
- LinkedList<Link> links = lookup.get( source );
+ LinkedList<Link> links = lookup.get(source);
- if ( links == null )
+ if (links == null)
{
links = new LinkedList<Link>();
- lookup.put( source, links );
+ lookup.put(source, links);
}
Link l = null;
- for ( Link c : links )
+ for (Link c : links)
{
- if ( c.getTarget() == target )
+ if (c.getTarget() == target)
{
l = c;
break;
}
}
- if ( l == null )
+ if (l == null)
{
- l = new Link( source, target );
- links.add( l );
- this.links.add( l );
+ l = new Link(source, target);
+ links.add(l);
+ this.links.add(l);
}
- l.addRequirement( requirement );
+ l.addRequirement(requirement);
}
-
public List<Link> getLinks()
{
return links;
}
-
public Set<ISigilBundle> getBundles()
{
return bundles;
}
-
- public Set<ISigilBundle> getTargets( ISigilBundle bundle )
+ public Set<ISigilBundle> getTargets(ISigilBundle bundle)
{
HashSet<ISigilBundle> targets = new HashSet<ISigilBundle>();
- for ( Link l : getLinks( bundle ) )
+ for (Link l : getLinks(bundle))
{
- targets.add( l.getTarget() );
+ targets.add(l.getTarget());
}
return targets;
}
-
- public List<Link> getLinks( ISigilBundle selected )
+ public List<Link> getLinks(ISigilBundle selected)
{
- List<Link> l = lookup.get( selected );
+ List<Link> l = lookup.get(selected);
return l == null ? Collections.<Link> emptyList() : l;
}
-
- public List<Link> getDependentLinks( ISigilBundle bundle )
+ public List<Link> getDependentLinks(ISigilBundle bundle)
{
- ArrayList<Link> found = new ArrayList<Link>( links.size() );
+ ArrayList<Link> found = new ArrayList<Link>(links.size());
- for ( Link l : links )
+ for (Link l : links)
{
- if ( l.getTarget() == bundle )
+ if (l.getTarget() == bundle)
{
- found.add( l );
+ found.add(l);
}
}
Modified: felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/BundleGraphContentProvider.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/BundleGraphContentProvider.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/BundleGraphContentProvider.java (original)
+++ felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/BundleGraphContentProvider.java Mon Aug 2 17:08:03 2010
@@ -19,43 +19,37 @@
package org.apache.felix.sigil.eclipse.ui.internal.views.resolution;
-
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.zest.core.viewers.IGraphContentProvider;
-
public class BundleGraphContentProvider implements IGraphContentProvider
{
- public Object[] getElements( Object input )
+ public Object[] getElements(Object input)
{
- BundleGraph graph = ( BundleGraph ) input;
+ BundleGraph graph = (BundleGraph) input;
return graph.getLinks().toArray();
}
-
- public Object getDestination( Object element )
+ public Object getDestination(Object element)
{
- Link l = ( Link ) element;
+ Link l = (Link) element;
return l.isSatisfied() ? l.getTarget() : new Link.Unsatisfied();
}
-
- public Object getSource( Object element )
+ public Object getSource(Object element)
{
- Link l = ( Link ) element;
+ Link l = (Link) element;
return l.getSource();
}
-
public void dispose()
{
// TODO Auto-generated method stub
}
-
- public void inputChanged( Viewer viewer, Object oldInput, Object newInput )
+ public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
{
}
Modified: felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/BundleGraphLabelProvider.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/BundleGraphLabelProvider.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/BundleGraphLabelProvider.java (original)
+++ felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/BundleGraphLabelProvider.java Mon Aug 2 17:08:03 2010
@@ -19,7 +19,6 @@
package org.apache.felix.sigil.eclipse.ui.internal.views.resolution;
-
import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
import org.apache.felix.sigil.eclipse.ui.SigilUI;
import org.eclipse.jface.viewers.LabelProvider;
@@ -27,30 +26,27 @@ import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.ISharedImages;
import org.eclipse.ui.PlatformUI;
-
public class BundleGraphLabelProvider extends LabelProvider
{
private BundleResolverView view;
-
- public BundleGraphLabelProvider( BundleResolverView view )
+ public BundleGraphLabelProvider(BundleResolverView view)
{
this.view = view;
}
-
@Override
- public String getText( Object element )
+ public String getText(Object element)
{
- if ( element instanceof Link )
+ if (element instanceof Link)
{
- Link l = ( Link ) element;
- if ( l.isSatisfied() )
+ Link l = (Link) element;
+ if (l.isSatisfied())
{
- if ( view.isDisplayed( BundleResolverView.LINK_LABELS ) )
+ if (view.isDisplayed(BundleResolverView.LINK_LABELS))
{
- return view.getLinkText( ( Link ) element );
+ return view.getLinkText((Link) element);
}
else
{
@@ -59,15 +55,16 @@ public class BundleGraphLabelProvider ex
}
else
{
- return view.getLinkText( ( Link ) element );
+ return view.getLinkText((Link) element);
}
}
- else if ( element instanceof ISigilBundle )
+ else if (element instanceof ISigilBundle)
{
- ISigilBundle b = ( ISigilBundle ) element;
- return b.getBundleInfo().getSymbolicName() + ": " + b.getBundleInfo().getVersion();
+ ISigilBundle b = (ISigilBundle) element;
+ return b.getBundleInfo().getSymbolicName() + ": "
+ + b.getBundleInfo().getVersion();
}
- else if ( element instanceof Link.Unsatisfied )
+ else if (element instanceof Link.Unsatisfied)
{
return "unsatisfied";
}
@@ -77,18 +74,19 @@ public class BundleGraphLabelProvider ex
}
}
-
@Override
- public Image getImage( Object element )
+ public Image getImage(Object element)
{
Image result = null;
- if ( element instanceof ISigilBundle )
+ if (element instanceof ISigilBundle)
{
- result = SigilUI.cacheImage( "icons/bundle.gif", BundleGraphLabelProvider.class.getClassLoader() );
+ result = SigilUI.cacheImage("icons/bundle.gif",
+ BundleGraphLabelProvider.class.getClassLoader());
}
- else if ( element instanceof Link.Unsatisfied )
+ else if (element instanceof Link.Unsatisfied)
{
- return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK);
+ return PlatformUI.getWorkbench().getSharedImages().getImage(
+ ISharedImages.IMG_OBJS_ERROR_TSK);
}
return result;
Modified: felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/BundleGraphViewFilter.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/BundleGraphViewFilter.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/BundleGraphViewFilter.java (original)
+++ felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/BundleGraphViewFilter.java Mon Aug 2 17:08:03 2010
@@ -19,48 +19,44 @@
package org.apache.felix.sigil.eclipse.ui.internal.views.resolution;
-
import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerFilter;
-
public class BundleGraphViewFilter extends ViewerFilter
{
private BundleResolverView view;
-
- public BundleGraphViewFilter( BundleResolverView view )
+ public BundleGraphViewFilter(BundleResolverView view)
{
this.view = view;
}
-
@Override
- public boolean select( Viewer viewer, Object parentElement, Object element )
+ public boolean select(Viewer viewer, Object parentElement, Object element)
{
- if ( !view.isDisplayed( BundleResolverView.LOCAL_LINKS ) )
+ if (!view.isDisplayed(BundleResolverView.LOCAL_LINKS))
{
- if ( element instanceof Link )
+ if (element instanceof Link)
{
- Link l = ( Link ) element;
+ Link l = (Link) element;
return l.getSource() != l.getTarget();
}
}
- if ( !view.isDisplayed( BundleResolverView.SATISFIED ) )
+ if (!view.isDisplayed(BundleResolverView.SATISFIED))
{
- if ( element instanceof Link )
+ if (element instanceof Link)
{
- Link l = ( Link ) element;
+ Link l = (Link) element;
return !l.isSatisfied();
}
- else if ( element instanceof ISigilBundle )
+ else if (element instanceof ISigilBundle)
{
- ISigilBundle bundle = ( ISigilBundle ) element;
- for ( Link l : view.getBundlegraph().getLinks( bundle ) )
+ ISigilBundle bundle = (ISigilBundle) element;
+ for (Link l : view.getBundlegraph().getLinks(bundle))
{
- if ( !l.isSatisfied() )
+ if (!l.isSatisfied())
{
return true;
}
@@ -69,14 +65,14 @@ public class BundleGraphViewFilter exten
}
}
- if ( !view.isDisplayed( BundleResolverView.UNSATISFIED ) )
+ if (!view.isDisplayed(BundleResolverView.UNSATISFIED))
{
- if ( element instanceof Link )
+ if (element instanceof Link)
{
- Link l = ( Link ) element;
+ Link l = (Link) element;
return l.isSatisfied();
}
- else if ( element instanceof Link.Unsatisfied )
+ else if (element instanceof Link.Unsatisfied)
{
return false;
}
Modified: felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/BundleResolverView.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/BundleResolverView.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/BundleResolverView.java (original)
+++ felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/BundleResolverView.java Mon Aug 2 17:08:03 2010
@@ -19,7 +19,6 @@
package org.apache.felix.sigil.eclipse.ui.internal.views.resolution;
-
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -60,7 +59,6 @@ import org.eclipse.zest.layouts.LayoutSt
import org.eclipse.zest.layouts.algorithms.RadialLayoutAlgorithm;
import org.eclipse.zest.layouts.algorithms.TreeLayoutAlgorithm;
-
public class BundleResolverView extends ViewPart
{
@@ -98,149 +96,140 @@ public class BundleResolverView extends
private String showMsg;
private String hideMsg;
-
- ToggleDisplayAction( String key, String showMsg, String hideMsg )
+ ToggleDisplayAction(String key, String showMsg, String hideMsg)
{
this.key = key;
this.showMsg = showMsg;
this.hideMsg = hideMsg;
- setText( BundleResolverView.this.isDisplayed( key ) ? hideMsg : showMsg );
+ setText(BundleResolverView.this.isDisplayed(key) ? hideMsg : showMsg);
}
-
@Override
public void run()
{
- BundleResolverView.this.setDisplayed( key, !BundleResolverView.this.isDisplayed( key ) );
- setText( BundleResolverView.this.isDisplayed( key ) ? hideMsg : showMsg );
+ BundleResolverView.this.setDisplayed(key,
+ !BundleResolverView.this.isDisplayed(key));
+ setText(BundleResolverView.this.isDisplayed(key) ? hideMsg : showMsg);
}
}
-
- public void setInput( final IModelElement element )
+ public void setInput(final IModelElement element)
{
- if ( current == null || !current.equals( element ) )
+ if (current == null || !current.equals(element))
{
- SigilCore.log( "Set input " + element );
+ SigilCore.log("Set input " + element);
current = element;
redraw();
}
}
-
- public void setDisplayed( String key, boolean b )
+ public void setDisplayed(String key, boolean b)
{
- displayed.put( key, b );
+ displayed.put(key, b);
- if ( key == DEPENDENTS )
+ if (key == DEPENDENTS)
{
int style = LayoutStyles.NO_LAYOUT_NODE_RESIZING;
- viewer.setLayoutAlgorithm( b ? new TreeLayoutAlgorithm( style ) : new RadialLayoutAlgorithm( style ) );
+ viewer.setLayoutAlgorithm(b ? new TreeLayoutAlgorithm(style)
+ : new RadialLayoutAlgorithm(style));
redraw();
}
- else if ( key == OPTIONAL )
+ else if (key == OPTIONAL)
{
redraw();
}
- else if ( key == SATISFIED || key == UNSATISFIED )
+ else if (key == SATISFIED || key == UNSATISFIED)
{
viewer.refresh();
}
}
-
- public boolean isDisplayed( String key )
+ public boolean isDisplayed(String key)
{
- return displayed.get( key );
+ return displayed.get(key);
}
-
@Override
public void setFocus()
{
}
-
@Override
- public void createPartControl( Composite parent )
+ public void createPartControl(Composite parent)
{
init();
- createViewer( parent );
+ createViewer(parent);
createListeners();
createMenu();
}
-
private void init()
{
- displayed.put( LINK_LABELS, false );
- displayed.put( LOCAL_LINKS, false );
- displayed.put( DEPENDENTS, false );
- displayed.put( OPTIONAL, false );
- displayed.put( SATISFIED, true );
- displayed.put( UNSATISFIED, true );
+ displayed.put(LINK_LABELS, false);
+ displayed.put(LOCAL_LINKS, false);
+ displayed.put(DEPENDENTS, false);
+ displayed.put(OPTIONAL, false);
+ displayed.put(SATISFIED, true);
+ displayed.put(UNSATISFIED, true);
}
-
public BundleGraph getBundlegraph()
{
- return ( BundleGraph ) viewer.getInput();
+ return (BundleGraph) viewer.getInput();
}
-
GraphViewer getGraphViewer()
{
return viewer;
}
-
- String getLinkText( Link link )
+ String getLinkText(Link link)
{
StringBuffer buf = new StringBuffer();
- for ( IModelElement e : link.getRequirements() )
+ for (IModelElement e : link.getRequirements())
{
- if ( buf.length() > 0 )
+ if (buf.length() > 0)
{
- buf.append( "\n" );
+ buf.append("\n");
}
- if ( e instanceof IPackageImport )
+ if (e instanceof IPackageImport)
{
- IPackageImport pi = ( IPackageImport ) e;
- buf.append( "import " + pi.getPackageName() + " : " + pi.getVersions() + ": "
- + ( pi.isOptional() ? "optional" : "mandatory" ) );
+ IPackageImport pi = (IPackageImport) e;
+ buf.append("import " + pi.getPackageName() + " : " + pi.getVersions()
+ + ": " + (pi.isOptional() ? "optional" : "mandatory"));
}
- else if ( e instanceof IRequiredBundle )
+ else if (e instanceof IRequiredBundle)
{
- IRequiredBundle rb = ( IRequiredBundle ) e;
- buf.append( "required bundle " + rb.getSymbolicName() + " : " + rb.getVersions() + ": "
- + ( rb.isOptional() ? "optional" : "mandatory" ) );
+ IRequiredBundle rb = (IRequiredBundle) e;
+ buf.append("required bundle " + rb.getSymbolicName() + " : "
+ + rb.getVersions() + ": "
+ + (rb.isOptional() ? "optional" : "mandatory"));
}
}
return buf.toString();
}
-
private synchronized void redraw()
{
final IModelElement element = current;
- if ( job != null )
+ if (job != null)
{
job.cancel();
}
- job = new Job( "Resolving " + current )
+ job = new Job("Resolving " + current)
{
@Override
- protected IStatus run( IProgressMonitor progress )
+ protected IStatus run(IProgressMonitor progress)
{
try
{
- resolve( element, progress );
+ resolve(element, progress);
return Status.OK_STATUS;
}
- catch ( CoreException e )
+ catch (CoreException e)
{
return e.getStatus();
}
@@ -249,151 +238,150 @@ public class BundleResolverView extends
job.schedule();
}
-
- private void resolve( IModelElement element, IProgressMonitor progress ) throws CoreException
+ private void resolve(IModelElement element, IProgressMonitor progress)
+ throws CoreException
{
final BundleGraph graph = new BundleGraph();
- IResolutionMonitor monitor = new ResolutionMonitorAdapter( progress )
+ IResolutionMonitor monitor = new ResolutionMonitorAdapter(progress)
{
@Override
- public void startResolution( IModelElement requirement )
+ public void startResolution(IModelElement requirement)
{
- graph.startResolution( requirement );
+ graph.startResolution(requirement);
}
-
@Override
- public void endResolution( IModelElement requirement, ISigilBundle provider )
+ public void endResolution(IModelElement requirement, ISigilBundle provider)
{
- graph.endResolution( requirement, provider );
+ graph.endResolution(requirement, provider);
}
};
- ISigilProjectModel project = findProject( element );
- IRepositoryManager repository = SigilCore.getRepositoryManager( project );
+ ISigilProjectModel project = findProject(element);
+ IRepositoryManager repository = SigilCore.getRepositoryManager(project);
int options = ResolutionConfig.IGNORE_ERRORS;
- if ( isDisplayed( DEPENDENTS ) )
+ if (isDisplayed(DEPENDENTS))
{
options |= ResolutionConfig.INCLUDE_DEPENDENTS;
}
- if ( isDisplayed( OPTIONAL ) )
+ if (isDisplayed(OPTIONAL))
{
options |= ResolutionConfig.INCLUDE_OPTIONAL;
}
- ResolutionConfig config = new ResolutionConfig( options );
+ ResolutionConfig config = new ResolutionConfig(options);
try
{
- repository.getBundleResolver().resolve( element, config, monitor );
+ repository.getBundleResolver().resolve(element, config, monitor);
}
- catch ( ResolutionException e )
+ catch (ResolutionException e)
{
- throw SigilCore.newCoreException( "Failed to resolve " + element, e );
+ throw SigilCore.newCoreException("Failed to resolve " + element, e);
}
- SigilUI.runInUI( new Runnable()
+ SigilUI.runInUI(new Runnable()
{
public void run()
{
- viewer.setInput( graph );
+ viewer.setInput(graph);
addCustomUIElements();
}
- } );
+ });
}
-
- private static ISigilProjectModel findProject( IModelElement element )
+ private static ISigilProjectModel findProject(IModelElement element)
{
- if ( element == null )
+ if (element == null)
{
return null;
}
- if ( element instanceof ISigilProjectModel )
+ if (element instanceof ISigilProjectModel)
{
- return ( ISigilProjectModel ) element;
+ return (ISigilProjectModel) element;
}
- return element.getAncestor( ISigilProjectModel.class );
+ return element.getAncestor(ISigilProjectModel.class);
}
-
@SuppressWarnings("unchecked")
private void addCustomUIElements()
{
- if ( !isDisplayed( LINK_LABELS ) )
+ if (!isDisplayed(LINK_LABELS))
{
- for ( GraphConnection c : ( List<GraphConnection> ) viewer.getGraphControl().getConnections() )
+ for (GraphConnection c : (List<GraphConnection>) viewer.getGraphControl().getConnections())
{
- if ( c.getData() instanceof Link )
+ if (c.getData() instanceof Link)
{
- c.setTooltip( buildToolTip( ( Link ) c.getData() ) );
+ c.setTooltip(buildToolTip((Link) c.getData()));
}
}
}
}
-
- private IFigure buildToolTip( Link link )
+ private IFigure buildToolTip(Link link)
{
Label l = new Label();
- l.setText( getLinkText( link ) );
+ l.setText(getLinkText(link));
return l;
}
-
- private void createViewer( Composite parent )
+ private void createViewer(Composite parent)
{
- parent.setLayout( new FillLayout() );
- viewer = new GraphViewer( parent, SWT.H_SCROLL | SWT.V_SCROLL );
+ parent.setLayout(new FillLayout());
+ viewer = new GraphViewer(parent, SWT.H_SCROLL | SWT.V_SCROLL);
IContentProvider contentProvider = new BundleGraphContentProvider();
- viewer.setContentProvider( contentProvider );
- viewer.setLabelProvider( new BundleGraphLabelProvider( this ) );
- viewer.addFilter( new BundleGraphViewFilter( this ) );
+ viewer.setContentProvider(contentProvider);
+ viewer.setLabelProvider(new BundleGraphLabelProvider(this));
+ viewer.addFilter(new BundleGraphViewFilter(this));
int style = LayoutStyles.NO_LAYOUT_NODE_RESIZING;
- viewer.setLayoutAlgorithm( isDisplayed( DEPENDENTS ) ? new TreeLayoutAlgorithm( style )
- : new RadialLayoutAlgorithm( style ) );
- viewer.addSelectionChangedListener( new BundleConnectionHighlighter( this ) );
- viewer.setInput( new BundleGraph() );
+ viewer.setLayoutAlgorithm(isDisplayed(DEPENDENTS) ? new TreeLayoutAlgorithm(style)
+ : new RadialLayoutAlgorithm(style));
+ viewer.addSelectionChangedListener(new BundleConnectionHighlighter(this));
+ viewer.setInput(new BundleGraph());
}
-
private void createMenu()
{
IActionBars action = getViewSite().getActionBars();
- action.getMenuManager().add( new ToggleDisplayAction( LINK_LABELS, SHOW_LINK_LABELS, HIDE_LINK_LABELS ) );
- action.getMenuManager().add( new ToggleDisplayAction( LOCAL_LINKS, SHOW_LOCAL_LINKS, HIDE_LOCAL_LINKS ) );
- action.getMenuManager().add( new ToggleDisplayAction( DEPENDENTS, SHOW_DEPENDENTS, HIDE_DEPENDENTS ) );
- action.getMenuManager().add( new ToggleDisplayAction( OPTIONAL, SHOW_OPTIONAL, HIDE_OPTIONAL ) );
- action.getMenuManager().add( new ToggleDisplayAction( SATISFIED, SHOW_SATISFIED, HIDE_SATISFIED ) );
- action.getMenuManager().add( new ToggleDisplayAction( UNSATISFIED, SHOW_UNSATISFIED, HIDE_UNSATISFIED ) );
+ action.getMenuManager().add(
+ new ToggleDisplayAction(LINK_LABELS, SHOW_LINK_LABELS, HIDE_LINK_LABELS));
+ action.getMenuManager().add(
+ new ToggleDisplayAction(LOCAL_LINKS, SHOW_LOCAL_LINKS, HIDE_LOCAL_LINKS));
+ action.getMenuManager().add(
+ new ToggleDisplayAction(DEPENDENTS, SHOW_DEPENDENTS, HIDE_DEPENDENTS));
+ action.getMenuManager().add(
+ new ToggleDisplayAction(OPTIONAL, SHOW_OPTIONAL, HIDE_OPTIONAL));
+ action.getMenuManager().add(
+ new ToggleDisplayAction(SATISFIED, SHOW_SATISFIED, HIDE_SATISFIED));
+ action.getMenuManager().add(
+ new ToggleDisplayAction(UNSATISFIED, SHOW_UNSATISFIED, HIDE_UNSATISFIED));
action.updateActionBars();
}
-
private void createListeners()
{
- IPartService ps = ( IPartService ) getViewSite().getService( IPartService.class );
- ps.addPartListener( new EditorViewPartListener( this ) );
- viewer.getGraphControl().addControlListener( new ControlAdapter()
+ IPartService ps = (IPartService) getViewSite().getService(IPartService.class);
+ ps.addPartListener(new EditorViewPartListener(this));
+ viewer.getGraphControl().addControlListener(new ControlAdapter()
{
@Override
- public void controlResized( ControlEvent e )
+ public void controlResized(ControlEvent e)
{
- Graph g = ( Graph ) e.getSource();
+ Graph g = (Graph) e.getSource();
int x = g.getSize().x;
int y = g.getSize().y;
- if ( lastX != x || lastY != y )
+ if (lastX != x || lastY != y)
{
lastX = x;
lastY = y;
redraw();
}
}
- } );
+ });
}
}
Modified: felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/EditorViewPartListener.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/EditorViewPartListener.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/EditorViewPartListener.java (original)
+++ felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/EditorViewPartListener.java Mon Aug 2 17:08:03 2010
@@ -19,7 +19,6 @@
package org.apache.felix.sigil.eclipse.ui.internal.views.resolution;
-
import org.apache.felix.sigil.eclipse.SigilCore;
import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
import org.eclipse.core.resources.IProject;
@@ -30,86 +29,75 @@ import org.eclipse.ui.IFileEditorInput;
import org.eclipse.ui.IPartListener2;
import org.eclipse.ui.IWorkbenchPartReference;
-
public class EditorViewPartListener implements IPartListener2
{
private BundleResolverView bundleResolverView;
-
- public EditorViewPartListener( BundleResolverView bundleResolverView )
+ public EditorViewPartListener(BundleResolverView bundleResolverView)
{
this.bundleResolverView = bundleResolverView;
}
-
- public void partActivated( IWorkbenchPartReference partRef )
+ public void partActivated(IWorkbenchPartReference partRef)
{
- checkRef( partRef );
+ checkRef(partRef);
}
-
- public void partBroughtToTop( IWorkbenchPartReference partRef )
+ public void partBroughtToTop(IWorkbenchPartReference partRef)
{
// no action
}
-
- public void partClosed( IWorkbenchPartReference partRef )
+ public void partClosed(IWorkbenchPartReference partRef)
{
// no action
}
-
- public void partDeactivated( IWorkbenchPartReference partRef )
+ public void partDeactivated(IWorkbenchPartReference partRef)
{
// no action
}
-
- public void partHidden( IWorkbenchPartReference partRef )
+ public void partHidden(IWorkbenchPartReference partRef)
{
// no action
}
-
- public void partInputChanged( IWorkbenchPartReference partRef )
+ public void partInputChanged(IWorkbenchPartReference partRef)
{
// no action
}
-
- public void partOpened( IWorkbenchPartReference partRef )
+ public void partOpened(IWorkbenchPartReference partRef)
{
// no action
}
-
- public void partVisible( IWorkbenchPartReference partRef )
+ public void partVisible(IWorkbenchPartReference partRef)
{
// no action
}
-
- private void checkRef( IWorkbenchPartReference partRef )
+ private void checkRef(IWorkbenchPartReference partRef)
{
IEditorPart editor = partRef.getPage().getActiveEditor();
- if ( editor != null )
+ if (editor != null)
{
IEditorInput input = editor.getEditorInput();
- if ( input instanceof IFileEditorInput )
+ if (input instanceof IFileEditorInput)
{
- IFileEditorInput f = ( IFileEditorInput ) input;
+ IFileEditorInput f = (IFileEditorInput) input;
IProject project = f.getFile().getProject();
try
{
- ISigilProjectModel model = SigilCore.create( project );
- if ( model != null )
+ ISigilProjectModel model = SigilCore.create(project);
+ if (model != null)
{
- bundleResolverView.setInput( model );
+ bundleResolverView.setInput(model);
}
}
- catch ( CoreException e )
+ catch (CoreException e)
{
// TODO Auto-generated catch block
e.printStackTrace();
Modified: felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/Link.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/Link.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/Link.java (original)
+++ felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/resolution/Link.java Mon Aug 2 17:08:03 2010
@@ -19,7 +19,6 @@
package org.apache.felix.sigil.eclipse.ui.internal.views.resolution;
-
import java.util.Collections;
import java.util.Comparator;
import java.util.LinkedList;
@@ -30,7 +29,6 @@ import org.apache.felix.sigil.common.mod
import org.apache.felix.sigil.common.model.osgi.IPackageImport;
import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
-
public class Link
{
public static class Unsatisfied
@@ -45,13 +43,13 @@ public class Link
private static final Comparator<IModelElement> comparator = new Comparator<IModelElement>()
{
- public int compare( IModelElement o1, IModelElement o2 )
+ public int compare(IModelElement o1, IModelElement o2)
{
- if ( o1 instanceof IRequiredBundle )
+ if (o1 instanceof IRequiredBundle)
{
- if ( o2 instanceof IRequiredBundle )
+ if (o2 instanceof IRequiredBundle)
{
- return compareBundles( ( IRequiredBundle ) o1, ( IRequiredBundle ) o2 );
+ return compareBundles((IRequiredBundle) o1, (IRequiredBundle) o2);
}
else
{
@@ -60,25 +58,24 @@ public class Link
}
else
{
- if ( o2 instanceof IRequiredBundle )
+ if (o2 instanceof IRequiredBundle)
{
return 1;
}
else
{
- return compareNonBundles( o1, o2 );
+ return compareNonBundles(o1, o2);
}
}
}
-
- private int compareNonBundles( IModelElement o1, IModelElement o2 )
+ private int compareNonBundles(IModelElement o1, IModelElement o2)
{
- if ( o1 instanceof IPackageImport )
+ if (o1 instanceof IPackageImport)
{
- if ( o2 instanceof IPackageImport )
+ if (o2 instanceof IPackageImport)
{
- return compareImports( ( IPackageImport ) o1, ( IPackageImport ) o2 );
+ return compareImports((IPackageImport) o1, (IPackageImport) o2);
}
else
{
@@ -87,7 +84,7 @@ public class Link
}
else
{
- if ( o2 instanceof IPackageImport )
+ if (o2 instanceof IPackageImport)
{
return 1;
}
@@ -98,81 +95,71 @@ public class Link
}
}
-
- private int compareImports( IPackageImport o1, IPackageImport o2 )
+ private int compareImports(IPackageImport o1, IPackageImport o2)
{
- return o1.getPackageName().compareTo( o2.getPackageName() );
+ return o1.getPackageName().compareTo(o2.getPackageName());
}
-
- private int compareBundles( IRequiredBundle o1, IRequiredBundle o2 )
+ private int compareBundles(IRequiredBundle o1, IRequiredBundle o2)
{
- return o1.getSymbolicName().compareTo( o2.getSymbolicName() );
+ return o1.getSymbolicName().compareTo(o2.getSymbolicName());
}
};
-
- public Link( ISigilBundle source, ISigilBundle target )
+ public Link(ISigilBundle source, ISigilBundle target)
{
this.source = source;
this.target = target;
}
-
public ISigilBundle getSource()
{
return source;
}
-
public ISigilBundle getTarget()
{
return target;
}
-
public boolean isSatisfied()
{
return target != null;
}
-
- public void addRequirement( IModelElement requirement )
+ public void addRequirement(IModelElement requirement)
{
- requirements.add( requirement );
- Collections.sort( requirements, comparator );
+ requirements.add(requirement);
+ Collections.sort(requirements, comparator);
}
-
public String toString()
{
return "Link[" + source + "->" + target + "]";
}
-
public List<IModelElement> getRequirements()
{
return requirements;
}
-
public boolean isOptional()
{
- for ( IModelElement e : requirements )
+ for (IModelElement e : requirements)
{
- if ( e instanceof IPackageImport )
+ if (e instanceof IPackageImport)
{
- IPackageImport pi = ( IPackageImport ) e;
- if ( !pi.isOptional() )
+ IPackageImport pi = (IPackageImport) e;
+ if (!pi.isOptional())
{
return false;
}
}
- else if ( e instanceof IRequiredBundle )
+ else if (e instanceof IRequiredBundle)
{
- IRequiredBundle rb = ( IRequiredBundle ) e;
- if ( !rb.isOptional() )
+ IRequiredBundle rb = (IRequiredBundle) e;
+ if (!rb.isOptional())
{
return false;
}
Modified: felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/wizard/SigilNewResourceWizard.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/wizard/SigilNewResourceWizard.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/wizard/SigilNewResourceWizard.java (original)
+++ felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/wizard/SigilNewResourceWizard.java Mon Aug 2 17:08:03 2010
@@ -19,7 +19,6 @@
package org.apache.felix.sigil.eclipse.ui.internal.wizard;
-
import org.eclipse.core.resources.IFile;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.swt.widgets.Display;
@@ -30,7 +29,6 @@ import org.eclipse.ui.PartInitException;
import org.eclipse.ui.ide.IDE;
import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
-
/**
* @author dave
*
@@ -38,27 +36,27 @@ import org.eclipse.ui.wizards.newresourc
public abstract class SigilNewResourceWizard extends BasicNewResourceWizard implements INewWizard
{
- protected void selectRevealAndShow( IFile file )
+ protected void selectRevealAndShow(IFile file)
{
- selectAndReveal( file );
+ selectAndReveal(file);
// Open editor on new file.
IWorkbenchWindow dw = getWorkbench().getActiveWorkbenchWindow();
try
{
- if ( dw != null )
+ if (dw != null)
{
IWorkbenchPage page = dw.getActivePage();
- if ( page != null )
+ if (page != null)
{
- IDE.openEditor( page, file, true );
+ IDE.openEditor(page, file, true);
}
}
}
- catch ( PartInitException e )
+ catch (PartInitException e)
{
- MessageDialog.openError( Display.getCurrent().getActiveShell(), "Initialisation error", "Failed to open "
- + file );
+ MessageDialog.openError(Display.getCurrent().getActiveShell(),
+ "Initialisation error", "Failed to open " + file);
}
}
Modified: felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/wizard/WorkspaceContentProvider.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/wizard/WorkspaceContentProvider.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/wizard/WorkspaceContentProvider.java (original)
+++ felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/wizard/WorkspaceContentProvider.java Mon Aug 2 17:08:03 2010
@@ -19,7 +19,6 @@
package org.apache.felix.sigil.eclipse.ui.internal.wizard;
-
import java.util.ArrayList;
import java.util.List;
@@ -32,78 +31,75 @@ import org.eclipse.core.runtime.CoreExce
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer;
-
public class WorkspaceContentProvider implements ITreeContentProvider
{
private final boolean includeNonSigil;
private final boolean includeClosed;
-
- public WorkspaceContentProvider( boolean includeNonSigil, boolean includeClosed )
+ public WorkspaceContentProvider(boolean includeNonSigil, boolean includeClosed)
{
this.includeNonSigil = includeNonSigil;
this.includeClosed = includeClosed;
}
-
- public Object[] getChildren( Object parentElement )
+ public Object[] getChildren(Object parentElement)
{
Object[] result = null;
- if ( parentElement instanceof IWorkspace )
+ if (parentElement instanceof IWorkspace)
{
- IProject[] projects = ( ( IWorkspace ) parentElement ).getRoot().getProjects();
- if ( includeNonSigil && includeClosed )
+ IProject[] projects = ((IWorkspace) parentElement).getRoot().getProjects();
+ if (includeNonSigil && includeClosed)
{
result = projects;
}
else
{
- List<IProject> includedProjects = new ArrayList<IProject>( projects.length );
- for ( IProject project : projects )
+ List<IProject> includedProjects = new ArrayList<IProject>(projects.length);
+ for (IProject project : projects)
{
- if ( !includeClosed && !project.isOpen() )
+ if (!includeClosed && !project.isOpen())
{
continue;
}
- if ( !includeNonSigil )
+ if (!includeNonSigil)
{
try
{
- if ( project.getNature( SigilCore.NATURE_ID ) == null )
+ if (project.getNature(SigilCore.NATURE_ID) == null)
{
continue;
}
}
- catch ( CoreException e )
+ catch (CoreException e)
{
continue;
}
}
- includedProjects.add( project );
+ includedProjects.add(project);
}
- result = includedProjects.toArray( new IProject[includedProjects.size()] );
+ result = includedProjects.toArray(new IProject[includedProjects.size()]);
}
}
- else if ( parentElement instanceof IContainer )
+ else if (parentElement instanceof IContainer)
{
try
{
- IResource[] members = ( ( IContainer ) parentElement ).members();
- List<IResource> children = new ArrayList<IResource>( members.length );
- for ( int i = 0; i < members.length; i++ )
+ IResource[] members = ((IContainer) parentElement).members();
+ List<IResource> children = new ArrayList<IResource>(members.length);
+ for (int i = 0; i < members.length; i++)
{
- if ( members[i].getType() != IResource.FILE )
+ if (members[i].getType() != IResource.FILE)
{
- children.add( members[i] );
+ children.add(members[i]);
}
}
- result = children.toArray( new IResource[children.size()] );
+ result = children.toArray(new IResource[children.size()]);
}
- catch ( CoreException e )
+ catch (CoreException e)
{
// Shouldn't happen
}
@@ -112,35 +108,30 @@ public class WorkspaceContentProvider im
return result;
}
-
- public Object getParent( Object element )
+ public Object getParent(Object element)
{
- if ( element instanceof IResource )
+ if (element instanceof IResource)
{
- return ( ( IResource ) element ).getParent();
+ return ((IResource) element).getParent();
}
return null;
}
-
- public boolean hasChildren( Object element )
+ public boolean hasChildren(Object element)
{
- return ( element instanceof IContainer ) && ( ( IContainer ) element ).isAccessible();
+ return (element instanceof IContainer) && ((IContainer) element).isAccessible();
}
-
- public Object[] getElements( Object inputElement )
+ public Object[] getElements(Object inputElement)
{
- return getChildren( inputElement );
+ return getChildren(inputElement);
}
-
public void dispose()
{
}
-
- public void inputChanged( Viewer viewer, Object oldInput, Object newInput )
+ public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
{
}
}
Modified: felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/util/AccumulatorAdapter.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/util/AccumulatorAdapter.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/util/AccumulatorAdapter.java (original)
+++ felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/util/AccumulatorAdapter.java Mon Aug 2 17:08:03 2010
@@ -19,22 +19,19 @@
package org.apache.felix.sigil.eclipse.ui.util;
-
import java.util.Collection;
import java.util.LinkedList;
-
public abstract class AccumulatorAdapter<E> implements IAccumulator<E>
{
- public void addElement( E element )
+ public void addElement(E element)
{
LinkedList<E> list = new LinkedList<E>();
- list.add( element );
- addElements( list );
+ list.add(element);
+ addElements(list);
};
-
- public void addElements( Collection<? extends E> elements )
+ public void addElements(Collection<? extends E> elements)
{
}
}