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 2009/07/21 20:51:41 UTC
svn commit: r796467 [18/25] - in /felix/trunk/sigil:
common/core.tests/src/org/apache/felix/sigil/core/
common/core/src/org/apache/felix/sigil/bnd/
common/core/src/org/apache/felix/sigil/config/
common/core/src/org/apache/felix/sigil/core/ common/core/...
Modified: felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/TestingSection.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/TestingSection.java?rev=796467&r1=796466&r2=796467&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/TestingSection.java (original)
+++ felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/TestingSection.java Tue Jul 21 18:51:33 2009
@@ -19,6 +19,7 @@
package org.apache.felix.sigil.ui.eclipse.ui.editors.project;
+
import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
import org.apache.felix.sigil.ui.eclipse.ui.form.SigilPage;
import org.apache.felix.sigil.ui.eclipse.ui.form.SigilSection;
@@ -35,62 +36,80 @@
import org.eclipse.ui.forms.widgets.Hyperlink;
import org.eclipse.ui.forms.widgets.Section;
-public class TestingSection extends SigilSection {
-
- public TestingSection(SigilPage page, Composite parent, ISigilProjectModel project) throws CoreException {
- super( page, parent, project );
- }
-
- protected void createSection(Section section,FormToolkit toolkit ) {
- setTitle("Testing");
-
- Composite body = createTableWrapBody(1, toolkit);
+
+public class TestingSection extends SigilSection
+{
+
+ public TestingSection( SigilPage page, Composite parent, ISigilProjectModel project ) throws CoreException
+ {
+ super( page, parent, project );
+ }
+
+
+ protected void createSection( Section section, FormToolkit toolkit )
+ {
+ setTitle( "Testing" );
+
+ Composite body = createTableWrapBody( 1, toolkit );
toolkit.createLabel( body, "Test this project by launching a separate Newton application:" );
-
+
Hyperlink launch = toolkit.createHyperlink( body, "Launch a newton container", SWT.NULL );
launch.setHref( "launchShortcut.run.org.cauldron.sigil.launching.shortcut" );
- launch.addHyperlinkListener(this);
-
+ launch.addHyperlinkListener( this );
+
Hyperlink debug = toolkit.createHyperlink( body, "Debug a newton container", SWT.NULL );
debug.setHref( "launchShortcut.debug.org.cauldron.sigil.launching.shortcut" );
- debug.addHyperlinkListener(this);
+ debug.addHyperlinkListener( this );
}
- public void linkActivated(HyperlinkEvent e) {
- String href = (String) e.getHref();
- if (href.startsWith("launchShortcut.")) { //$NON-NLS-1$
- href = href.substring(15);
- int index = href.indexOf('.');
- if (index < 0)
- return; // error. Format of href should be launchShortcut.<mode>.<launchShortcutId>
- String mode = href.substring(0, index);
- String id = href.substring(index + 1);
-
- //getEditor().doSave(null);
-
- IExtensionRegistry registry = Platform.getExtensionRegistry();
- IConfigurationElement[] elements = registry.getConfigurationElementsFor("org.eclipse.debug.ui.launchShortcuts"); //$NON-NLS-1$
- for (int i = 0; i < elements.length; i++) {
- if (id.equals(elements[i].getAttribute("id"))) //$NON-NLS-1$
- try {
- ILaunchShortcut shortcut = (ILaunchShortcut)elements[i].createExecutableExtension("class"); //$NON-NLS-1$
- // preLaunch();
- shortcut.launch(new StructuredSelection(getLaunchObject()), mode);
- } catch (CoreException e1) {
- e1.printStackTrace();
- }
- }
- }
- }
-
- private Object getLaunchObject() {
- return getProjectModel().getProject();
- }
- public void linkEntered(HyperlinkEvent e) {
- }
+ public void linkActivated( HyperlinkEvent e )
+ {
+ String href = ( String ) e.getHref();
+ if ( href.startsWith( "launchShortcut." ) ) { //$NON-NLS-1$
+ href = href.substring( 15 );
+ int index = href.indexOf( '.' );
+ if ( index < 0 )
+ return; // error. Format of href should be launchShortcut.<mode>.<launchShortcutId>
+ String mode = href.substring( 0, index );
+ String id = href.substring( index + 1 );
+
+ //getEditor().doSave(null);
+
+ IExtensionRegistry registry = Platform.getExtensionRegistry();
+ IConfigurationElement[] elements = registry
+ .getConfigurationElementsFor( "org.eclipse.debug.ui.launchShortcuts" ); //$NON-NLS-1$
+ for ( int i = 0; i < elements.length; i++ )
+ {
+ if ( id.equals( elements[i].getAttribute( "id" ) ) ) //$NON-NLS-1$
+ try
+ {
+ ILaunchShortcut shortcut = ( ILaunchShortcut ) elements[i].createExecutableExtension( "class" ); //$NON-NLS-1$
+ // preLaunch();
+ shortcut.launch( new StructuredSelection( getLaunchObject() ), mode );
+ }
+ catch ( CoreException e1 )
+ {
+ e1.printStackTrace();
+ }
+ }
+ }
+ }
+
+
+ private Object getLaunchObject()
+ {
+ return getProjectModel().getProject();
+ }
+
- public void linkExited(HyperlinkEvent e) {
- }
+ public void linkEntered( HyperlinkEvent e )
+ {
+ }
+
+
+ public void linkExited( HyperlinkEvent e )
+ {
+ }
}
Modified: felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ToolsSection.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ToolsSection.java?rev=796467&r1=796466&r2=796467&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ToolsSection.java (original)
+++ felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ToolsSection.java Tue Jul 21 18:51:33 2009
@@ -19,6 +19,7 @@
package org.apache.felix.sigil.ui.eclipse.ui.editors.project;
+
import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
import org.apache.felix.sigil.ui.eclipse.actions.PruneProjectDependenciesAction;
import org.apache.felix.sigil.ui.eclipse.actions.ResolveProjectDependenciesAction;
@@ -32,51 +33,68 @@
import org.eclipse.ui.forms.widgets.Hyperlink;
import org.eclipse.ui.forms.widgets.Section;
-public class ToolsSection extends SigilSection {
-
- public ToolsSection(SigilPage page, Composite parent, ISigilProjectModel project) throws CoreException {
- super( page, parent, project );
- }
-
- protected void createSection(Section section,FormToolkit toolkit ) {
- setTitle("Tools");
-
- Composite body = createTableWrapBody(1, toolkit);
+
+public class ToolsSection extends SigilSection
+{
+
+ public ToolsSection( SigilPage page, Composite parent, ISigilProjectModel project ) throws CoreException
+ {
+ super( page, parent, project );
+ }
+
+
+ protected void createSection( Section section, FormToolkit toolkit )
+ {
+ setTitle( "Tools" );
+
+ Composite body = createTableWrapBody( 1, toolkit );
toolkit.createLabel( body, "Tools to help manage this project:" );
-
+
Hyperlink launch = toolkit.createHyperlink( body, "Resolve missing dependencies", SWT.NULL );
launch.setHref( "resolve" );
- launch.addHyperlinkListener(this);
-
+ launch.addHyperlinkListener( this );
+
Hyperlink debug = toolkit.createHyperlink( body, "Prune unused dependencies", SWT.NULL );
debug.setHref( "prune" );
- debug.addHyperlinkListener(this);
+ debug.addHyperlinkListener( this );
+ }
+
+
+ public void linkActivated( HyperlinkEvent e )
+ {
+ String href = ( String ) e.getHref();
+ if ( "resolve".equals( href ) )
+ {
+ handleResolve();
+ }
+ else if ( "prune".equals( href ) )
+ {
+ handlePrune();
+ }
+ }
+
+
+ private void handlePrune()
+ {
+ new PruneProjectDependenciesAction( getProjectModel() ).run();
+ }
+
+
+ private void handleResolve()
+ {
+ final ISigilProjectModel project = getProjectModel();
+ new ResolveProjectDependenciesAction( project, true ).run();
+ }
+
+
+ public void linkEntered( HyperlinkEvent e )
+ {
+ }
+
+
+ public void linkExited( HyperlinkEvent e )
+ {
}
- public void linkActivated(HyperlinkEvent e) {
- String href = (String) e.getHref();
- if ( "resolve".equals( href ) ) {
- handleResolve();
- }
- else if ( "prune".equals( href ) ) {
- handlePrune();
- }
- }
-
- private void handlePrune() {
- new PruneProjectDependenciesAction(getProjectModel()).run();
- }
-
- private void handleResolve() {
- final ISigilProjectModel project = getProjectModel();
- new ResolveProjectDependenciesAction(project, true).run();
- }
-
- public void linkEntered(HyperlinkEvent e) {
- }
-
- public void linkExited(HyperlinkEvent e) {
- }
-
}
Modified: felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/VersionRangeComponent.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/VersionRangeComponent.java?rev=796467&r1=796466&r2=796467&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/VersionRangeComponent.java (original)
+++ felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/VersionRangeComponent.java Tue Jul 21 18:51:33 2009
@@ -19,6 +19,7 @@
package org.apache.felix.sigil.ui.eclipse.ui.editors.project;
+
import java.util.HashSet;
import java.util.Set;
@@ -38,214 +39,275 @@
import org.eclipse.swt.widgets.Text;
import org.osgi.framework.Version;
-public class VersionRangeComponent extends Composite {
- private VersionRange versions = VersionRange.ANY_VERSION;
-
- private Button specificButton;
-
- private Text specificText;
- private Button rangeButton;
- private Text minimumText;
- private Text maximumText;
- private Button minInclusiveButton;
- private Button maxInclusiveButton;
-
- private Set<VersionsChangeListener> listeners = new HashSet<VersionsChangeListener>();
- private Set<IValidationListener> validationListeners = new HashSet<IValidationListener>();
-
- public VersionRangeComponent(Composite parent, int style) {
- super( parent, style );
- createComponents(this);
- }
-
- public void addVersionChangeListener(VersionsChangeListener listener) {
- synchronized(listeners) {
- listeners.add( listener );
- }
- }
-
- public void removeVersionChangeListener(VersionsChangeListener listener) {
- synchronized(listeners) {
- listeners.remove( listener );
- }
- }
-
- public void addValidationListener(IValidationListener listener) {
- validationListeners.add(listener);
- }
-
- public void removeValidationListener(IValidationListener listener) {
- validationListeners.remove(listener);
- }
-
- @Override
- public void setEnabled(boolean enabled) {
- super.setEnabled(enabled);
- specificButton.setEnabled(enabled);
- rangeButton.setEnabled(enabled);
- if ( enabled ) {
- specificButton.setSelection(versions.isPointVersion());
- setSpecific();
- }
- else {
- minimumText.setEnabled(enabled);
- maximumText.setEnabled(enabled);
- minInclusiveButton.setEnabled(enabled);
- maxInclusiveButton.setEnabled(enabled);
- }
- }
-
-
- public VersionRange getVersions() {
- return versions;
- }
-
- public void setVersions(VersionRange versions) {
- this.versions = versions == null ? VersionRange.ANY_VERSION : versions;
- updateFields();
- }
-
- private void updateFields() {
- if ( versions.isPointVersion() ) {
- specificButton.setSelection(true);
- specificText.setText( versions.getCeiling() == VersionRange.INFINITE_VERSION ? "*" : versions.getFloor().toString() );
- }
- else {
- rangeButton.setSelection( true );
- minimumText.setText( versions.getFloor().toString() );
- minInclusiveButton.setSelection( !versions.isOpenFloor() );
- maximumText.setText( versions.getCeiling() == VersionRange.INFINITE_VERSION ? "*" : versions.getCeiling().toString() );
- maxInclusiveButton.setSelection( !versions.isOpenCeiling() );
- }
-
- setSpecific();
- }
-
- private void createComponents(Composite body) {
- setLayout( new GridLayout( 3, false ) );
-
- specificButton = new Button( body, SWT.RADIO );
- specificButton.setText( "Specific:" );
- specificButton.addSelectionListener( new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- setSpecific();
- }
- });
-
- new Label( body, SWT.NONE ).setText("Version:");
-
- specificText = new Text( body, SWT.BORDER );
- specificText.addKeyListener( new KeyAdapter() {
- @Override
- public void keyReleased(KeyEvent e) {
- setVersions();
- }
- });
-
- rangeButton = new Button( body, SWT.RADIO );
- rangeButton.setText( "Range:" );
-
- new Label(body, SWT.NONE).setText("Minimum:");
-
- minimumText = new Text( body, SWT.BORDER );
- minimumText.addKeyListener( new KeyAdapter() {
- @Override
- public void keyReleased(KeyEvent e) {
- setVersions();
- }
- });
-
- minInclusiveButton = new Button( body, SWT.CHECK );
- minInclusiveButton.setText( "inclusive" );
- minInclusiveButton.setSelection(true);
- minInclusiveButton.addSelectionListener( new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- setVersions();
- }
- });
-
- new Label( body, SWT.NONE ).setText("Maximum:");
- maximumText = new Text( body, SWT.BORDER );
- maximumText.addKeyListener( new KeyAdapter() {
- @Override
- public void keyReleased(KeyEvent e) {
- setVersions();
- }
- });
-
- maxInclusiveButton = new Button( body, SWT.CHECK );
- maxInclusiveButton.setText( "inclusive" );
- maxInclusiveButton.setSelection(false);
- maxInclusiveButton.addSelectionListener( new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- setVersions();
- }
- });
-
- // Layout
- specificButton.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 3, 1));
- specificText.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1));
- rangeButton.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 3, 1));
- minimumText.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
- maximumText.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
-
- updateFields();
- }
-
- private void setVersions() {
- try {
- if ( specificButton.getSelection() ) {
- if ( "*".equals( specificText.getText() ) ) {
- versions = VersionRange.ANY_VERSION;
- }
- else if ( specificText.getText().trim().length() == 0 ) {
- versions = null;
- }
- else {
- Version v = Version.parseVersion( specificText.getText().trim() );
- versions = new VersionRange( false, v, v, false);
- }
- }
- else {
- Version min = Version.parseVersion( minimumText.getText() );
- Version max = "*".equals( maximumText.getText() ) ? VersionRange.INFINITE_VERSION : Version.parseVersion( maximumText.getText() );
- versions = new VersionRange( !minInclusiveButton.getSelection(), min, max, !maxInclusiveButton.getSelection() );
- }
- fireValidationMessage(null, IMessageProvider.NONE);
- }
- catch (IllegalArgumentException e) {
- versions = null;
- fireValidationMessage("Invalid version", IMessageProvider.ERROR);
- }
-
- fireVersionChange();
- }
-
- private void fireVersionChange() {
- synchronized( listeners ) {
- for ( VersionsChangeListener l : listeners ) {
- l.versionsChanged(versions);
- }
- }
- }
-
- private void fireValidationMessage(String message, int level) {
- for (IValidationListener validationListener : validationListeners) {
- validationListener.validationMessage(message, level);
- }
- }
-
- private void setSpecific() {
- boolean specific = specificButton.getSelection();
- specificButton.setSelection(specific);
- specificText.setEnabled(specific);
- minimumText.setEnabled(!specific);
- maximumText.setEnabled(!specific);
- minInclusiveButton.setEnabled(!specific);
- maxInclusiveButton.setEnabled(!specific);
- setVersions();
- }
+
+public class VersionRangeComponent extends Composite
+{
+ private VersionRange versions = VersionRange.ANY_VERSION;
+
+ private Button specificButton;
+
+ private Text specificText;
+ private Button rangeButton;
+ private Text minimumText;
+ private Text maximumText;
+ private Button minInclusiveButton;
+ private Button maxInclusiveButton;
+
+ private Set<VersionsChangeListener> listeners = new HashSet<VersionsChangeListener>();
+ private Set<IValidationListener> validationListeners = new HashSet<IValidationListener>();
+
+
+ public VersionRangeComponent( Composite parent, int style )
+ {
+ super( parent, style );
+ createComponents( this );
+ }
+
+
+ public void addVersionChangeListener( VersionsChangeListener listener )
+ {
+ synchronized ( listeners )
+ {
+ listeners.add( listener );
+ }
+ }
+
+
+ public void removeVersionChangeListener( VersionsChangeListener listener )
+ {
+ synchronized ( listeners )
+ {
+ listeners.remove( listener );
+ }
+ }
+
+
+ public void addValidationListener( IValidationListener listener )
+ {
+ validationListeners.add( listener );
+ }
+
+
+ public void removeValidationListener( IValidationListener listener )
+ {
+ validationListeners.remove( listener );
+ }
+
+
+ @Override
+ public void setEnabled( boolean enabled )
+ {
+ super.setEnabled( enabled );
+ specificButton.setEnabled( enabled );
+ rangeButton.setEnabled( enabled );
+ if ( enabled )
+ {
+ specificButton.setSelection( versions.isPointVersion() );
+ setSpecific();
+ }
+ else
+ {
+ minimumText.setEnabled( enabled );
+ maximumText.setEnabled( enabled );
+ minInclusiveButton.setEnabled( enabled );
+ maxInclusiveButton.setEnabled( enabled );
+ }
+ }
+
+
+ public VersionRange getVersions()
+ {
+ return versions;
+ }
+
+
+ public void setVersions( VersionRange versions )
+ {
+ this.versions = versions == null ? VersionRange.ANY_VERSION : versions;
+ updateFields();
+ }
+
+
+ private void updateFields()
+ {
+ if ( versions.isPointVersion() )
+ {
+ specificButton.setSelection( true );
+ specificText.setText( versions.getCeiling() == VersionRange.INFINITE_VERSION ? "*" : versions.getFloor()
+ .toString() );
+ }
+ else
+ {
+ rangeButton.setSelection( true );
+ minimumText.setText( versions.getFloor().toString() );
+ minInclusiveButton.setSelection( !versions.isOpenFloor() );
+ maximumText.setText( versions.getCeiling() == VersionRange.INFINITE_VERSION ? "*" : versions.getCeiling()
+ .toString() );
+ maxInclusiveButton.setSelection( !versions.isOpenCeiling() );
+ }
+
+ setSpecific();
+ }
+
+
+ private void createComponents( Composite body )
+ {
+ setLayout( new GridLayout( 3, false ) );
+
+ specificButton = new Button( body, SWT.RADIO );
+ specificButton.setText( "Specific:" );
+ specificButton.addSelectionListener( new SelectionAdapter()
+ {
+ @Override
+ public void widgetSelected( SelectionEvent e )
+ {
+ setSpecific();
+ }
+ } );
+
+ new Label( body, SWT.NONE ).setText( "Version:" );
+
+ specificText = new Text( body, SWT.BORDER );
+ specificText.addKeyListener( new KeyAdapter()
+ {
+ @Override
+ public void keyReleased( KeyEvent e )
+ {
+ setVersions();
+ }
+ } );
+
+ rangeButton = new Button( body, SWT.RADIO );
+ rangeButton.setText( "Range:" );
+
+ new Label( body, SWT.NONE ).setText( "Minimum:" );
+
+ minimumText = new Text( body, SWT.BORDER );
+ minimumText.addKeyListener( new KeyAdapter()
+ {
+ @Override
+ public void keyReleased( KeyEvent e )
+ {
+ setVersions();
+ }
+ } );
+
+ minInclusiveButton = new Button( body, SWT.CHECK );
+ minInclusiveButton.setText( "inclusive" );
+ minInclusiveButton.setSelection( true );
+ minInclusiveButton.addSelectionListener( new SelectionAdapter()
+ {
+ @Override
+ public void widgetSelected( SelectionEvent e )
+ {
+ setVersions();
+ }
+ } );
+
+ new Label( body, SWT.NONE ).setText( "Maximum:" );
+ maximumText = new Text( body, SWT.BORDER );
+ maximumText.addKeyListener( new KeyAdapter()
+ {
+ @Override
+ public void keyReleased( KeyEvent e )
+ {
+ setVersions();
+ }
+ } );
+
+ maxInclusiveButton = new Button( body, SWT.CHECK );
+ maxInclusiveButton.setText( "inclusive" );
+ maxInclusiveButton.setSelection( false );
+ maxInclusiveButton.addSelectionListener( new SelectionAdapter()
+ {
+ @Override
+ public void widgetSelected( SelectionEvent e )
+ {
+ setVersions();
+ }
+ } );
+
+ // Layout
+ specificButton.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, false, 3, 1 ) );
+ specificText.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, false, 2, 1 ) );
+ rangeButton.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, false, 3, 1 ) );
+ minimumText.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, false ) );
+ maximumText.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, false ) );
+
+ updateFields();
+ }
+
+
+ private void setVersions()
+ {
+ try
+ {
+ if ( specificButton.getSelection() )
+ {
+ if ( "*".equals( specificText.getText() ) )
+ {
+ versions = VersionRange.ANY_VERSION;
+ }
+ else if ( specificText.getText().trim().length() == 0 )
+ {
+ versions = null;
+ }
+ else
+ {
+ Version v = Version.parseVersion( specificText.getText().trim() );
+ versions = new VersionRange( false, v, v, false );
+ }
+ }
+ else
+ {
+ Version min = Version.parseVersion( minimumText.getText() );
+ Version max = "*".equals( maximumText.getText() ) ? VersionRange.INFINITE_VERSION : Version
+ .parseVersion( maximumText.getText() );
+ versions = new VersionRange( !minInclusiveButton.getSelection(), min, max, !maxInclusiveButton
+ .getSelection() );
+ }
+ fireValidationMessage( null, IMessageProvider.NONE );
+ }
+ catch ( IllegalArgumentException e )
+ {
+ versions = null;
+ fireValidationMessage( "Invalid version", IMessageProvider.ERROR );
+ }
+
+ fireVersionChange();
+ }
+
+
+ private void fireVersionChange()
+ {
+ synchronized ( listeners )
+ {
+ for ( VersionsChangeListener l : listeners )
+ {
+ l.versionsChanged( versions );
+ }
+ }
+ }
+
+
+ private void fireValidationMessage( String message, int level )
+ {
+ for ( IValidationListener validationListener : validationListeners )
+ {
+ validationListener.validationMessage( message, level );
+ }
+ }
+
+
+ private void setSpecific()
+ {
+ boolean specific = specificButton.getSelection();
+ specificButton.setSelection( specific );
+ specificText.setEnabled( specific );
+ minimumText.setEnabled( !specific );
+ maximumText.setEnabled( !specific );
+ minInclusiveButton.setEnabled( !specific );
+ maxInclusiveButton.setEnabled( !specific );
+ setVersions();
+ }
}
Modified: felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/VersionsChangeListener.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/VersionsChangeListener.java?rev=796467&r1=796466&r2=796467&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/VersionsChangeListener.java (original)
+++ felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/VersionsChangeListener.java Tue Jul 21 18:51:33 2009
@@ -19,8 +19,11 @@
package org.apache.felix.sigil.ui.eclipse.ui.editors.project;
+
import org.apache.felix.sigil.model.common.VersionRange;
-public interface VersionsChangeListener {
- void versionsChanged(VersionRange range);
+
+public interface VersionsChangeListener
+{
+ void versionsChanged( VersionRange range );
}
Modified: felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/WrappedContentProposal.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/WrappedContentProposal.java?rev=796467&r1=796466&r2=796467&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/WrappedContentProposal.java (original)
+++ felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/WrappedContentProposal.java Tue Jul 21 18:51:33 2009
@@ -19,44 +19,63 @@
package org.apache.felix.sigil.ui.eclipse.ui.editors.project;
+
import org.eclipse.jface.fieldassist.IContentProposal;
-public class WrappedContentProposal<T> implements IContentProposal {
-
- private final T element;
- private final IElementDescriptor<? super T> descriptor;
-
- private WrappedContentProposal(T element, IElementDescriptor<? super T> descriptor) {
- this.element = element;
- this.descriptor = descriptor;
- }
-
- public static <T> WrappedContentProposal<T> newInstance(T element, IElementDescriptor<? super T> descriptor) {
- return new WrappedContentProposal<T>(element, descriptor);
- }
-
- public String getContent() {
- return descriptor.getName(element);
- }
-
- public int getCursorPosition() {
- return 0;
- }
-
- public String getDescription() {
- return null;
- }
-
- public String getLabel() {
- return descriptor.getLabel(element);
- }
-
- public T getElement() {
- return element;
- }
-
- @Override
- public String toString() {
- return getLabel();
- }
+
+public class WrappedContentProposal<T> implements IContentProposal
+{
+
+ private final T element;
+ private final IElementDescriptor<? super T> descriptor;
+
+
+ private WrappedContentProposal( T element, IElementDescriptor<? super T> descriptor )
+ {
+ this.element = element;
+ this.descriptor = descriptor;
+ }
+
+
+ public static <T> WrappedContentProposal<T> newInstance( T element, IElementDescriptor<? super T> descriptor )
+ {
+ return new WrappedContentProposal<T>( element, descriptor );
+ }
+
+
+ public String getContent()
+ {
+ return descriptor.getName( element );
+ }
+
+
+ public int getCursorPosition()
+ {
+ return 0;
+ }
+
+
+ public String getDescription()
+ {
+ return null;
+ }
+
+
+ public String getLabel()
+ {
+ return descriptor.getLabel( element );
+ }
+
+
+ public T getElement()
+ {
+ return element;
+ }
+
+
+ @Override
+ public String toString()
+ {
+ return getLabel();
+ }
}
Modified: felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/IFormValueConverter.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/IFormValueConverter.java?rev=796467&r1=796466&r2=796467&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/IFormValueConverter.java (original)
+++ felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/IFormValueConverter.java Tue Jul 21 18:51:33 2009
@@ -19,7 +19,11 @@
package org.apache.felix.sigil.ui.eclipse.ui.form;
-public interface IFormValueConverter {
- String getLabel(Object value);
- Object getValue(String label);
+
+public interface IFormValueConverter
+{
+ String getLabel( Object value );
+
+
+ Object getValue( String label );
}
Modified: felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/ISigilFormEntryListener.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/ISigilFormEntryListener.java?rev=796467&r1=796466&r2=796467&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/ISigilFormEntryListener.java (original)
+++ felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/ISigilFormEntryListener.java Tue Jul 21 18:51:33 2009
@@ -19,7 +19,11 @@
package org.apache.felix.sigil.ui.eclipse.ui.form;
-public interface ISigilFormEntryListener {
- void browseButtonSelected(SigilFormEntry form);
- void textValueChanged(SigilFormEntry form);
+
+public interface ISigilFormEntryListener
+{
+ void browseButtonSelected( SigilFormEntry form );
+
+
+ void textValueChanged( SigilFormEntry form );
}
Modified: felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilFormEntry.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilFormEntry.java?rev=796467&r1=796466&r2=796467&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilFormEntry.java (original)
+++ felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilFormEntry.java Tue Jul 21 18:51:33 2009
@@ -19,6 +19,7 @@
package org.apache.felix.sigil.ui.eclipse.ui.form;
+
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.FocusAdapter;
import org.eclipse.swt.events.FocusEvent;
@@ -35,139 +36,188 @@
import org.eclipse.ui.forms.IFormColors;
import org.eclipse.ui.forms.widgets.FormToolkit;
-public class SigilFormEntry {
- private static final IFormValueConverter NULL_DESCRIPTOR = new IFormValueConverter() {
- public String getLabel(Object value) {
- return (String) value;
- }
-
- public Object getValue(String label) {
- return label;
- }
- };
-
- private Label lbl;
- private Text txt;
- private Button btn;
- private IFormValueConverter descriptor;
- private boolean freeText = true;
-
- private Object value;
- private ISigilFormEntryListener listener;
-
- public SigilFormEntry(Composite parent, FormToolkit toolkit, String title) {
- this(parent, toolkit, title, null, null);
- }
-
- public SigilFormEntry(Composite parent, FormToolkit toolkit, String title, String browse, IFormValueConverter descriptor) {
- this.descriptor = descriptor == null ? NULL_DESCRIPTOR : descriptor;
- createComponent(parent, title, browse, toolkit);
- }
-
- public void setFormEntryListener(ISigilFormEntryListener listener) {
- this.listener = listener;
- }
-
- public void setValue(Object value) {
- this.value = value;
- String text = descriptor.getLabel(value);
- if ( text == null ) {
- text = "";
- }
- txt.setText(text);
- handleValueChanged();
- }
-
- public Object getValue() {
- return value;
- }
-
- public void setFreeText(boolean freeText) {
- this.freeText = freeText;
- }
-
- public void setEditable(boolean editable) {
- lbl.setEnabled(editable);
- txt.setEditable(editable);
- if ( btn != null ) {
- btn.setEnabled(editable);
- }
- }
-
- private void createComponent(Composite parent, String title, String browse, FormToolkit toolkit) {
- lbl = toolkit.createLabel(parent, title);
- lbl.setForeground(toolkit.getColors().getColor(IFormColors.TITLE));
-
- txt = toolkit.createText(parent, "", SWT.SINGLE | SWT.BORDER);
- txt.addKeyListener( new KeyAdapter() {
- @Override
- public void keyPressed(KeyEvent e) {
- if ( freeText ) {
- switch ( e.character ) {
- case '\r': handleValueChanged();
- }
- }
- else {
- switch ( e.character ) {
- case '\b':
- setValue(null);
- handleValueChanged();
- default:
- e.doit = false;
- break;
- }
- }
- }
- });
- txt.addFocusListener( new FocusAdapter() {
- @Override
- public void focusLost(FocusEvent e) {
- handleValueChanged();
- }
- });
-
- if ( browse != null ) {
- btn = toolkit.createButton(parent, browse, SWT.PUSH);
- btn.addSelectionListener( new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- handleBrowseSelected();
- }
- });
- }
-
- fillIntoGrid(parent);
- }
-
- private void handleBrowseSelected() {
- if ( listener != null ) {
- listener.browseButtonSelected(this);
- }
- }
-
- private void handleValueChanged() {
- if ( freeText ) {
- this.value = descriptor.getValue(txt.getText());
- }
- if ( listener != null ) {
- listener.textValueChanged(this);
- }
- }
-
- private void fillIntoGrid(Composite parent) {
- if ( parent.getLayout() instanceof GridLayout ) {
- GridLayout layout = (GridLayout) parent.getLayout();
-
- int cols = layout.numColumns;
-
- lbl.setLayoutData( new GridData(SWT.LEFT, SWT.CENTER, false, false) );
-
- if ( btn == null ) {
- txt.setLayoutData( new GridData(SWT.FILL, SWT.CENTER, true, false, Math.max(1, cols - 1), 1 ) );
- }
- else {
- txt.setLayoutData( new GridData(SWT.FILL, SWT.CENTER, true, false, Math.max(1, cols - 2), 1 ) );
- }
- }
- }
+
+public class SigilFormEntry
+{
+ private static final IFormValueConverter NULL_DESCRIPTOR = new IFormValueConverter()
+ {
+ public String getLabel( Object value )
+ {
+ return ( String ) value;
+ }
+
+
+ public Object getValue( String label )
+ {
+ return label;
+ }
+ };
+
+ private Label lbl;
+ private Text txt;
+ private Button btn;
+ private IFormValueConverter descriptor;
+ private boolean freeText = true;
+
+ private Object value;
+ private ISigilFormEntryListener listener;
+
+
+ public SigilFormEntry( Composite parent, FormToolkit toolkit, String title )
+ {
+ this( parent, toolkit, title, null, null );
+ }
+
+
+ public SigilFormEntry( Composite parent, FormToolkit toolkit, String title, String browse,
+ IFormValueConverter descriptor )
+ {
+ this.descriptor = descriptor == null ? NULL_DESCRIPTOR : descriptor;
+ createComponent( parent, title, browse, toolkit );
+ }
+
+
+ public void setFormEntryListener( ISigilFormEntryListener listener )
+ {
+ this.listener = listener;
+ }
+
+
+ public void setValue( Object value )
+ {
+ this.value = value;
+ String text = descriptor.getLabel( value );
+ if ( text == null )
+ {
+ text = "";
+ }
+ txt.setText( text );
+ handleValueChanged();
+ }
+
+
+ public Object getValue()
+ {
+ return value;
+ }
+
+
+ public void setFreeText( boolean freeText )
+ {
+ this.freeText = freeText;
+ }
+
+
+ public void setEditable( boolean editable )
+ {
+ lbl.setEnabled( editable );
+ txt.setEditable( editable );
+ if ( btn != null )
+ {
+ btn.setEnabled( editable );
+ }
+ }
+
+
+ private void createComponent( Composite parent, String title, String browse, FormToolkit toolkit )
+ {
+ lbl = toolkit.createLabel( parent, title );
+ lbl.setForeground( toolkit.getColors().getColor( IFormColors.TITLE ) );
+
+ txt = toolkit.createText( parent, "", SWT.SINGLE | SWT.BORDER );
+ txt.addKeyListener( new KeyAdapter()
+ {
+ @Override
+ public void keyPressed( KeyEvent e )
+ {
+ if ( freeText )
+ {
+ switch ( e.character )
+ {
+ case '\r':
+ handleValueChanged();
+ }
+ }
+ else
+ {
+ switch ( e.character )
+ {
+ case '\b':
+ setValue( null );
+ handleValueChanged();
+ default:
+ e.doit = false;
+ break;
+ }
+ }
+ }
+ } );
+ txt.addFocusListener( new FocusAdapter()
+ {
+ @Override
+ public void focusLost( FocusEvent e )
+ {
+ handleValueChanged();
+ }
+ } );
+
+ if ( browse != null )
+ {
+ btn = toolkit.createButton( parent, browse, SWT.PUSH );
+ btn.addSelectionListener( new SelectionAdapter()
+ {
+ @Override
+ public void widgetSelected( SelectionEvent e )
+ {
+ handleBrowseSelected();
+ }
+ } );
+ }
+
+ fillIntoGrid( parent );
+ }
+
+
+ private void handleBrowseSelected()
+ {
+ if ( listener != null )
+ {
+ listener.browseButtonSelected( this );
+ }
+ }
+
+
+ private void handleValueChanged()
+ {
+ if ( freeText )
+ {
+ this.value = descriptor.getValue( txt.getText() );
+ }
+ if ( listener != null )
+ {
+ listener.textValueChanged( this );
+ }
+ }
+
+
+ private void fillIntoGrid( Composite parent )
+ {
+ if ( parent.getLayout() instanceof GridLayout )
+ {
+ GridLayout layout = ( GridLayout ) parent.getLayout();
+
+ int cols = layout.numColumns;
+
+ lbl.setLayoutData( new GridData( SWT.LEFT, SWT.CENTER, false, false ) );
+
+ if ( btn == null )
+ {
+ txt.setLayoutData( new GridData( SWT.FILL, SWT.CENTER, true, false, Math.max( 1, cols - 1 ), 1 ) );
+ }
+ else
+ {
+ txt.setLayoutData( new GridData( SWT.FILL, SWT.CENTER, true, false, Math.max( 1, cols - 2 ), 1 ) );
+ }
+ }
+ }
}
Modified: felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilFormEntryAdapter.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilFormEntryAdapter.java?rev=796467&r1=796466&r2=796467&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilFormEntryAdapter.java (original)
+++ felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilFormEntryAdapter.java Tue Jul 21 18:51:33 2009
@@ -19,10 +19,15 @@
package org.apache.felix.sigil.ui.eclipse.ui.form;
-public class SigilFormEntryAdapter implements ISigilFormEntryListener{
- public void browseButtonSelected(SigilFormEntry form) {
- }
- public void textValueChanged(SigilFormEntry form) {
- }
+public class SigilFormEntryAdapter implements ISigilFormEntryListener
+{
+ public void browseButtonSelected( SigilFormEntry form )
+ {
+ }
+
+
+ public void textValueChanged( SigilFormEntry form )
+ {
+ }
}
Modified: felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilPage.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilPage.java?rev=796467&r1=796466&r2=796467&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilPage.java (original)
+++ felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilPage.java Tue Jul 21 18:51:33 2009
@@ -19,13 +19,17 @@
package org.apache.felix.sigil.ui.eclipse.ui.form;
+
import org.eclipse.ui.forms.editor.FormEditor;
import org.eclipse.ui.forms.editor.FormPage;
-public class SigilPage extends FormPage {
- public SigilPage(FormEditor editor, String id, String title) {
- super(editor, id, title);
- }
-
+public class SigilPage extends FormPage
+{
+
+ public SigilPage( FormEditor editor, String id, String title )
+ {
+ super( editor, id, title );
+ }
+
}
Modified: felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilSection.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilSection.java?rev=796467&r1=796466&r2=796467&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilSection.java (original)
+++ felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilSection.java Tue Jul 21 18:51:33 2009
@@ -19,6 +19,7 @@
package org.apache.felix.sigil.ui.eclipse.ui.form;
+
import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IResource;
@@ -41,110 +42,150 @@
import org.eclipse.ui.forms.widgets.TableWrapData;
import org.eclipse.ui.forms.widgets.TableWrapLayout;
+
@SuppressWarnings("restriction")
-public abstract class SigilSection extends SectionPart implements IFormEntryListener, IPartSelectionListener {
+public abstract class SigilSection extends SectionPart implements IFormEntryListener, IPartSelectionListener
+{
+
+ private SigilPage page;
+ private ISigilProjectModel project;
+
+
+ public SigilSection( SigilPage page, Composite parent, ISigilProjectModel project ) throws CoreException
+ {
+ super( parent, page.getManagedForm().getToolkit(), ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE
+ | ExpandableComposite.EXPANDED );
+ this.project = project;
+ this.page = page;
+ createSection( getSection(), page.getManagedForm().getToolkit() );
+ }
+
+
+ public ISigilProjectModel getProjectModel()
+ {
+ return project;
+ }
+
+
+ public SigilPage getPage()
+ {
+ return page;
+ }
+
+
+ public void setExpanded( boolean expanded )
+ {
+ getSection().setExpanded( expanded );
+ }
+
+
+ protected abstract void createSection( Section section, FormToolkit toolkit ) throws CoreException;
+
+
+ protected void setTitle( String title )
+ {
+ Section section = getSection();
+ section.setText( title );
+ section.setLayout( FormLayoutFactory.createClearTableWrapLayout( false, 1 ) );
+ TableWrapData data = new TableWrapData( TableWrapData.FILL_GRAB );
+ section.setLayoutData( data );
+ }
+
+
+ protected void setMarker( String type, String message, int priority, int severity ) throws CoreException
+ {
+ IFileEditorInput file = ( IFileEditorInput ) getPage().getEditor().getEditorInput();
+ IMarker marker = file.getFile().createMarker( type );
+ marker.setAttribute( IMarker.MESSAGE, message );
+ marker.setAttribute( IMarker.PRIORITY, priority );
+ marker.setAttribute( IMarker.SEVERITY, severity );
+ }
+
+
+ protected void clearMarkers() throws CoreException
+ {
+ IFileEditorInput file = ( IFileEditorInput ) getPage().getEditor().getEditorInput();
+ file.getFile().deleteMarkers( null, true, IResource.DEPTH_INFINITE );
+ }
+
+
+ protected Composite createTableWrapBody( int columns, FormToolkit toolkit )
+ {
+ Section section = getSection();
+ Composite client = toolkit.createComposite( section );
- private SigilPage page;
- private ISigilProjectModel project;
-
- public SigilSection(SigilPage page, Composite parent, ISigilProjectModel project) throws CoreException {
- super(parent, page.getManagedForm().getToolkit(), ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED );
- this.project = project;
- this.page = page;
- createSection( getSection(), page.getManagedForm().getToolkit() );
- }
-
- public ISigilProjectModel getProjectModel() {
- return project;
- }
-
- public SigilPage getPage() {
- return page;
- }
-
- public void setExpanded( boolean expanded ) {
- getSection().setExpanded(expanded);
- }
-
- protected abstract void createSection(Section section,FormToolkit toolkit ) throws CoreException;
-
- protected void setTitle( String title ) {
- Section section = getSection();
- section.setText( title );
- section.setLayout(FormLayoutFactory.createClearTableWrapLayout(false, 1));
- TableWrapData data = new TableWrapData(TableWrapData.FILL_GRAB);
- section.setLayoutData(data);
- }
-
- protected void setMarker(String type, String message, int priority, int severity) throws CoreException {
- IFileEditorInput file = (IFileEditorInput) getPage().getEditor().getEditorInput();
- IMarker marker = file.getFile().createMarker(type);
- marker.setAttribute( IMarker.MESSAGE, message );
- marker.setAttribute(IMarker.PRIORITY, priority);
- marker.setAttribute( IMarker.SEVERITY, severity );
- }
-
- protected void clearMarkers() throws CoreException {
- IFileEditorInput file = (IFileEditorInput) getPage().getEditor().getEditorInput();
- file.getFile().deleteMarkers(null, true, IResource.DEPTH_INFINITE );
- }
-
- protected Composite createTableWrapBody( int columns, FormToolkit toolkit ) {
- Section section = getSection();
- Composite client = toolkit.createComposite(section);
-
TableWrapLayout layout = new TableWrapLayout();
layout.leftMargin = layout.rightMargin = toolkit.getBorderStyle() != SWT.NULL ? 0 : 2;
layout.numColumns = columns;
- client.setLayout(layout);
- client.setLayoutData( new TableWrapData( TableWrapData.FILL_GRAB) );
-
- section.setClient(client);
-
+ client.setLayout( layout );
+ client.setLayoutData( new TableWrapData( TableWrapData.FILL_GRAB ) );
+
+ section.setClient( client );
+
return client;
- }
-
- protected Composite createGridBody( int columns, boolean columnsSameWidth, FormToolkit toolkit ) {
- Section section = getSection();
- Composite client = toolkit.createComposite(section);
-
- GridLayout layout = new GridLayout();
-
- layout.makeColumnsEqualWidth = columnsSameWidth;
- layout.numColumns = columns;
- client.setLayout(layout);
-
- client.setLayoutData( new TableWrapData( TableWrapData.FILL_GRAB) );
-
- section.setClient(client);
-
+ }
+
+
+ protected Composite createGridBody( int columns, boolean columnsSameWidth, FormToolkit toolkit )
+ {
+ Section section = getSection();
+ Composite client = toolkit.createComposite( section );
+
+ GridLayout layout = new GridLayout();
+
+ layout.makeColumnsEqualWidth = columnsSameWidth;
+ layout.numColumns = columns;
+ client.setLayout( layout );
+
+ client.setLayoutData( new TableWrapData( TableWrapData.FILL_GRAB ) );
+
+ section.setClient( client );
+
return client;
- }
-
- public void browseButtonSelected(FormEntry entry) {
- }
+ }
+
+
+ public void browseButtonSelected( FormEntry entry )
+ {
+ }
+
+
+ public void focusGained( FormEntry entry )
+ {
+ }
+
+
+ public void selectionChanged( FormEntry entry )
+ {
+ }
+
+
+ public void textDirty( FormEntry entry )
+ {
+ }
+
+
+ public void textValueChanged( FormEntry entry )
+ {
+ }
- public void focusGained(FormEntry entry) {
- }
- public void selectionChanged(FormEntry entry) {
- }
+ public void linkActivated( HyperlinkEvent e )
+ {
+ }
- public void textDirty(FormEntry entry) {
- }
- public void textValueChanged(FormEntry entry) {
- }
+ public void linkEntered( HyperlinkEvent e )
+ {
+ }
- public void linkActivated(HyperlinkEvent e) {
- }
- public void linkEntered(HyperlinkEvent e) {
- }
+ public void linkExited( HyperlinkEvent e )
+ {
+ }
- public void linkExited(HyperlinkEvent e) {
- }
- public void selectionChanged(IFormPart part, ISelection selection) {
- }
+ public void selectionChanged( IFormPart part, ISelection selection )
+ {
+ }
}
Modified: felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/FileSystemRepositoryWizard.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/FileSystemRepositoryWizard.java?rev=796467&r1=796466&r2=796467&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/FileSystemRepositoryWizard.java (original)
+++ felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/FileSystemRepositoryWizard.java Tue Jul 21 18:51:33 2009
@@ -19,11 +19,15 @@
package org.apache.felix.sigil.ui.eclipse.ui.internal.repository;
+
import org.apache.felix.sigil.ui.eclipse.ui.wizard.repository.RepositoryWizard;
-public class FileSystemRepositoryWizard extends RepositoryWizard {
- @Override
- public void addPages() {
- addPage( new FileSystemRepositoryWizardPage(this) );
- }
+
+public class FileSystemRepositoryWizard extends RepositoryWizard
+{
+ @Override
+ public void addPages()
+ {
+ addPage( new FileSystemRepositoryWizardPage( this ) );
+ }
}
Modified: felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/FileSystemRepositoryWizardPage.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/FileSystemRepositoryWizardPage.java?rev=796467&r1=796466&r2=796467&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/FileSystemRepositoryWizardPage.java (original)
+++ felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/FileSystemRepositoryWizardPage.java Tue Jul 21 18:51:33 2009
@@ -19,6 +19,7 @@
package org.apache.felix.sigil.ui.eclipse.ui.internal.repository;
+
import java.io.File;
import org.apache.felix.sigil.ui.eclipse.ui.wizard.repository.RepositoryWizard;
@@ -29,43 +30,56 @@
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
-public class FileSystemRepositoryWizardPage extends RepositoryWizardPage
- implements IWizardPage {
- private DirectoryFieldEditor dirEditor;
+public class FileSystemRepositoryWizardPage extends RepositoryWizardPage implements IWizardPage
+{
+
+ private DirectoryFieldEditor dirEditor;
+
- protected FileSystemRepositoryWizardPage(RepositoryWizard parent) {
- super("File System Repository", parent);
- }
-
- @Override
- public void createFieldEditors() {
- dirEditor = new DirectoryFieldEditor("dir", "Directory:", getFieldEditorParent() );
- dirEditor.getTextControl( getFieldEditorParent() ).addModifyListener( new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- checkPageComplete();
- }
- } );
-
- addField( dirEditor );
- addField(new BooleanFieldEditor("recurse", "Recurse:", getFieldEditorParent() ) );
- }
-
- @Override
- protected void checkPageComplete() {
- super.checkPageComplete();
- if ( isPageComplete() ) {
- setPageComplete(dirEditor.getStringValue().length() > 0);
- if ( isPageComplete() ) {
- if ( new File( dirEditor.getStringValue()).isDirectory() ) {
- setPageComplete(true);
- setErrorMessage(null);
- }
- else {
- setPageComplete(false);
- setErrorMessage("Invalid directory");
- }
- }
- }
- }
+ protected FileSystemRepositoryWizardPage( RepositoryWizard parent )
+ {
+ super( "File System Repository", parent );
+ }
+
+
+ @Override
+ public void createFieldEditors()
+ {
+ dirEditor = new DirectoryFieldEditor( "dir", "Directory:", getFieldEditorParent() );
+ dirEditor.getTextControl( getFieldEditorParent() ).addModifyListener( new ModifyListener()
+ {
+ public void modifyText( ModifyEvent e )
+ {
+ checkPageComplete();
+ }
+ } );
+
+ addField( dirEditor );
+ addField( new BooleanFieldEditor( "recurse", "Recurse:", getFieldEditorParent() ) );
+ }
+
+
+ @Override
+ protected void checkPageComplete()
+ {
+ super.checkPageComplete();
+ if ( isPageComplete() )
+ {
+ setPageComplete( dirEditor.getStringValue().length() > 0 );
+ if ( isPageComplete() )
+ {
+ if ( new File( dirEditor.getStringValue() ).isDirectory() )
+ {
+ setPageComplete( true );
+ setErrorMessage( null );
+ }
+ else
+ {
+ setPageComplete( false );
+ setErrorMessage( "Invalid directory" );
+ }
+ }
+ }
+ }
}
Modified: felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/OSGiInstallRepositoryWizard.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/OSGiInstallRepositoryWizard.java?rev=796467&r1=796466&r2=796467&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/OSGiInstallRepositoryWizard.java (original)
+++ felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/OSGiInstallRepositoryWizard.java Tue Jul 21 18:51:33 2009
@@ -19,11 +19,15 @@
package org.apache.felix.sigil.ui.eclipse.ui.internal.repository;
+
import org.apache.felix.sigil.ui.eclipse.ui.wizard.repository.RepositoryWizard;
-public class OSGiInstallRepositoryWizard extends RepositoryWizard {
- @Override
- public void addPages() {
- addPage( new OSGiInstallRepositoryWizardPage(this) );
- }
+
+public class OSGiInstallRepositoryWizard extends RepositoryWizard
+{
+ @Override
+ public void addPages()
+ {
+ addPage( new OSGiInstallRepositoryWizardPage( this ) );
+ }
}
Modified: felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/OSGiInstallRepositoryWizardPage.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/OSGiInstallRepositoryWizardPage.java?rev=796467&r1=796466&r2=796467&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/OSGiInstallRepositoryWizardPage.java (original)
+++ felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/OSGiInstallRepositoryWizardPage.java Tue Jul 21 18:51:33 2009
@@ -19,6 +19,7 @@
package org.apache.felix.sigil.ui.eclipse.ui.internal.repository;
+
import java.util.ArrayList;
import org.apache.felix.sigil.eclipse.SigilCore;
@@ -27,27 +28,31 @@
import org.apache.felix.sigil.ui.eclipse.ui.wizard.repository.RepositoryWizardPage;
import org.eclipse.jface.preference.RadioGroupFieldEditor;
-public class OSGiInstallRepositoryWizardPage extends RepositoryWizardPage {
- protected OSGiInstallRepositoryWizardPage(RepositoryWizard parent) {
- super("OSGi Install Repository", parent);
- }
-
- @Override
- public void createFieldEditors() {
- ArrayList<String[]> installs = new ArrayList<String[]>();
- for ( String id : SigilCore.getInstallManager().getInstallIDs() ) {
- IOSGiInstall i = SigilCore.getInstallManager().findInstall(id);
- installs.add( new String[] { i.getType().getName(), id } );
- }
- String[][] strs = installs.toArray( new String[installs.size()][] );
-
- RadioGroupFieldEditor editor = new RadioGroupFieldEditor(
- "id",
- "Install",
- 1, strs, getFieldEditorParent() );
-
- addField(editor);
- }
+public class OSGiInstallRepositoryWizardPage extends RepositoryWizardPage
+{
+
+ protected OSGiInstallRepositoryWizardPage( RepositoryWizard parent )
+ {
+ super( "OSGi Install Repository", parent );
+ }
+
+
+ @Override
+ public void createFieldEditors()
+ {
+ ArrayList<String[]> installs = new ArrayList<String[]>();
+ for ( String id : SigilCore.getInstallManager().getInstallIDs() )
+ {
+ IOSGiInstall i = SigilCore.getInstallManager().findInstall( id );
+ installs.add( new String[]
+ { i.getType().getName(), id } );
+ }
+ String[][] strs = installs.toArray( new String[installs.size()][] );
+
+ RadioGroupFieldEditor editor = new RadioGroupFieldEditor( "id", "Install", 1, strs, getFieldEditorParent() );
+
+ addField( editor );
+ }
}
Modified: felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/perspective/SigilPerspectiveFactory.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/perspective/SigilPerspectiveFactory.java?rev=796467&r1=796466&r2=796467&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/perspective/SigilPerspectiveFactory.java (original)
+++ felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/perspective/SigilPerspectiveFactory.java Tue Jul 21 18:51:33 2009
@@ -19,6 +19,7 @@
package org.apache.felix.sigil.ui.eclipse.ui.perspective;
+
import org.apache.felix.sigil.ui.eclipse.ui.SigilUI;
import org.eclipse.debug.ui.IDebugUIConstants;
import org.eclipse.jdt.ui.JavaUI;
@@ -27,85 +28,88 @@
import org.eclipse.ui.IPerspectiveFactory;
import org.eclipse.ui.progress.IProgressConstants;
-public class SigilPerspectiveFactory implements IPerspectiveFactory {
-
- private static final String ID_PROJECT_EXPLORER= "org.eclipse.ui.navigator.ProjectExplorer"; //$NON-NLS-1$
- private static final String ID_SEARCH_VIEW = "org.eclipse.search.ui.views.SearchView"; //$NON-NLS-1$
- private static final String ID_CONSOLE_VIEW = "org.eclipse.ui.console.ConsoleView"; //$NON-NLS-1$
- private static final String ID_TEMPLATES_VIEW = "org.eclipse.ui.texteditor.TemplatesView"; //$NON-NLS-N$
-
-
- public void createInitialLayout(IPageLayout layout) {
- /*
- * Use ProjectExplorer vs PackageExplorer due to a bug with Drag and Drop on Mac OS X which affects PackageExplorer
- * but not ProjectExplorer. https://bugs.eclipse.org/bugs/show_bug.cgi?id=243529
- */
- String editorArea = layout.getEditorArea();
-
- IFolderLayout folder= layout.createFolder("left", IPageLayout.LEFT, (float)0.25, editorArea); //$NON-NLS-1$
- folder.addView(ID_PROJECT_EXPLORER);
- folder.addView(JavaUI.ID_TYPE_HIERARCHY);
- folder.addPlaceholder(IPageLayout.ID_RES_NAV);
- folder.addPlaceholder(SigilUI.ID_REPOSITORY_VIEW);
- folder.addView(IPageLayout.ID_OUTLINE);
-
- IFolderLayout outputfolder= layout.createFolder("bottom", IPageLayout.BOTTOM, (float)0.75, editorArea); //$NON-NLS-1$
- outputfolder.addView(IPageLayout.ID_PROBLEM_VIEW);
- outputfolder.addView(JavaUI.ID_JAVADOC_VIEW);
- outputfolder.addView(JavaUI.ID_SOURCE_VIEW);
- outputfolder.addPlaceholder(ID_SEARCH_VIEW);
- outputfolder.addPlaceholder(ID_CONSOLE_VIEW);
- outputfolder.addPlaceholder(IPageLayout.ID_BOOKMARKS);
- outputfolder.addPlaceholder(IProgressConstants.PROGRESS_VIEW_ID);
- outputfolder.addPlaceholder(SigilUI.ID_DEPENDENCY_VIEW);
- outputfolder.addPlaceholder(SigilUI.ID_INSTANCES_VIEW);
-
- layout.addActionSet(IDebugUIConstants.LAUNCH_ACTION_SET);
- layout.addActionSet(JavaUI.ID_ACTION_SET);
- layout.addActionSet(JavaUI.ID_ELEMENT_CREATION_ACTION_SET);
- layout.addActionSet(IPageLayout.ID_NAVIGATE_ACTION_SET);
-
- // views - sigil
- layout.addShowViewShortcut(SigilUI.ID_REPOSITORY_VIEW);
- layout.addShowViewShortcut(SigilUI.ID_DEPENDENCY_VIEW);
- layout.addShowViewShortcut(SigilUI.ID_INSTANCES_VIEW);
-
- // views - java
- layout.addShowViewShortcut(JavaUI.ID_PACKAGES);
- layout.addShowViewShortcut(JavaUI.ID_TYPE_HIERARCHY);
- layout.addShowViewShortcut(JavaUI.ID_SOURCE_VIEW);
- layout.addShowViewShortcut(JavaUI.ID_JAVADOC_VIEW);
-
- // views - search
- layout.addShowViewShortcut(ID_SEARCH_VIEW);
-
- // views - debugging
- layout.addShowViewShortcut(ID_CONSOLE_VIEW);
-
- // views - standard workbench
- layout.addShowViewShortcut(IPageLayout.ID_OUTLINE);
- layout.addShowViewShortcut(IPageLayout.ID_PROBLEM_VIEW);
- layout.addShowViewShortcut(IPageLayout.ID_RES_NAV);
- layout.addShowViewShortcut(IPageLayout.ID_TASK_LIST);
- layout.addShowViewShortcut(IProgressConstants.PROGRESS_VIEW_ID);
- layout.addShowViewShortcut(ID_PROJECT_EXPLORER);
-
- // new actions - Java project creation wizard
- layout.addNewWizardShortcut("org.eclipse.jdt.ui.wizards.NewPackageCreationWizard"); //$NON-NLS-1$
- layout.addNewWizardShortcut("org.eclipse.jdt.ui.wizards.NewClassCreationWizard"); //$NON-NLS-1$
- layout.addNewWizardShortcut("org.eclipse.jdt.ui.wizards.NewInterfaceCreationWizard"); //$NON-NLS-1$
- layout.addNewWizardShortcut("org.eclipse.jdt.ui.wizards.NewEnumCreationWizard"); //$NON-NLS-1$
- layout.addNewWizardShortcut("org.eclipse.jdt.ui.wizards.NewAnnotationCreationWizard"); //$NON-NLS-1$
- layout.addNewWizardShortcut("org.eclipse.jdt.ui.wizards.NewSourceFolderCreationWizard"); //$NON-NLS-1$
- layout.addNewWizardShortcut("org.eclipse.jdt.ui.wizards.NewSnippetFileCreationWizard"); //$NON-NLS-1$
- layout.addNewWizardShortcut("org.eclipse.jdt.ui.wizards.NewJavaWorkingSetWizard"); //$NON-NLS-1$
- layout.addNewWizardShortcut("org.eclipse.ui.wizards.new.folder");//$NON-NLS-1$
- layout.addNewWizardShortcut("org.eclipse.ui.wizards.new.file");//$NON-NLS-1$
- layout.addNewWizardShortcut("org.eclipse.ui.editors.wizards.UntitledTextFileWizard");//$NON-NLS-1$
-
- layout.addNewWizardShortcut("org.cauldron.sigil.editors.newCompositeWizard");
- layout.addNewWizardShortcut("org.cauldron.sigil.editors.newSystemWizard");
- layout.addNewWizardShortcut("org.cauldron.sigil.editors.newProjectWizard");
- }
+
+public class SigilPerspectiveFactory implements IPerspectiveFactory
+{
+
+ private static final String ID_PROJECT_EXPLORER = "org.eclipse.ui.navigator.ProjectExplorer"; //$NON-NLS-1$
+ private static final String ID_SEARCH_VIEW = "org.eclipse.search.ui.views.SearchView"; //$NON-NLS-1$
+ private static final String ID_CONSOLE_VIEW = "org.eclipse.ui.console.ConsoleView"; //$NON-NLS-1$
+ private static final String ID_TEMPLATES_VIEW = "org.eclipse.ui.texteditor.TemplatesView"; //$NON-NLS-N$
+
+
+ public void createInitialLayout( IPageLayout layout )
+ {
+ /*
+ * Use ProjectExplorer vs PackageExplorer due to a bug with Drag and Drop on Mac OS X which affects PackageExplorer
+ * but not ProjectExplorer. https://bugs.eclipse.org/bugs/show_bug.cgi?id=243529
+ */
+ String editorArea = layout.getEditorArea();
+
+ IFolderLayout folder = layout.createFolder( "left", IPageLayout.LEFT, ( float ) 0.25, editorArea ); //$NON-NLS-1$
+ folder.addView( ID_PROJECT_EXPLORER );
+ folder.addView( JavaUI.ID_TYPE_HIERARCHY );
+ folder.addPlaceholder( IPageLayout.ID_RES_NAV );
+ folder.addPlaceholder( SigilUI.ID_REPOSITORY_VIEW );
+ folder.addView( IPageLayout.ID_OUTLINE );
+
+ IFolderLayout outputfolder = layout.createFolder( "bottom", IPageLayout.BOTTOM, ( float ) 0.75, editorArea ); //$NON-NLS-1$
+ outputfolder.addView( IPageLayout.ID_PROBLEM_VIEW );
+ outputfolder.addView( JavaUI.ID_JAVADOC_VIEW );
+ outputfolder.addView( JavaUI.ID_SOURCE_VIEW );
+ outputfolder.addPlaceholder( ID_SEARCH_VIEW );
+ outputfolder.addPlaceholder( ID_CONSOLE_VIEW );
+ outputfolder.addPlaceholder( IPageLayout.ID_BOOKMARKS );
+ outputfolder.addPlaceholder( IProgressConstants.PROGRESS_VIEW_ID );
+ outputfolder.addPlaceholder( SigilUI.ID_DEPENDENCY_VIEW );
+ outputfolder.addPlaceholder( SigilUI.ID_INSTANCES_VIEW );
+
+ layout.addActionSet( IDebugUIConstants.LAUNCH_ACTION_SET );
+ layout.addActionSet( JavaUI.ID_ACTION_SET );
+ layout.addActionSet( JavaUI.ID_ELEMENT_CREATION_ACTION_SET );
+ layout.addActionSet( IPageLayout.ID_NAVIGATE_ACTION_SET );
+
+ // views - sigil
+ layout.addShowViewShortcut( SigilUI.ID_REPOSITORY_VIEW );
+ layout.addShowViewShortcut( SigilUI.ID_DEPENDENCY_VIEW );
+ layout.addShowViewShortcut( SigilUI.ID_INSTANCES_VIEW );
+
+ // views - java
+ layout.addShowViewShortcut( JavaUI.ID_PACKAGES );
+ layout.addShowViewShortcut( JavaUI.ID_TYPE_HIERARCHY );
+ layout.addShowViewShortcut( JavaUI.ID_SOURCE_VIEW );
+ layout.addShowViewShortcut( JavaUI.ID_JAVADOC_VIEW );
+
+ // views - search
+ layout.addShowViewShortcut( ID_SEARCH_VIEW );
+
+ // views - debugging
+ layout.addShowViewShortcut( ID_CONSOLE_VIEW );
+
+ // views - standard workbench
+ layout.addShowViewShortcut( IPageLayout.ID_OUTLINE );
+ layout.addShowViewShortcut( IPageLayout.ID_PROBLEM_VIEW );
+ layout.addShowViewShortcut( IPageLayout.ID_RES_NAV );
+ layout.addShowViewShortcut( IPageLayout.ID_TASK_LIST );
+ layout.addShowViewShortcut( IProgressConstants.PROGRESS_VIEW_ID );
+ layout.addShowViewShortcut( ID_PROJECT_EXPLORER );
+
+ // new actions - Java project creation wizard
+ layout.addNewWizardShortcut( "org.eclipse.jdt.ui.wizards.NewPackageCreationWizard" ); //$NON-NLS-1$
+ layout.addNewWizardShortcut( "org.eclipse.jdt.ui.wizards.NewClassCreationWizard" ); //$NON-NLS-1$
+ layout.addNewWizardShortcut( "org.eclipse.jdt.ui.wizards.NewInterfaceCreationWizard" ); //$NON-NLS-1$
+ layout.addNewWizardShortcut( "org.eclipse.jdt.ui.wizards.NewEnumCreationWizard" ); //$NON-NLS-1$
+ layout.addNewWizardShortcut( "org.eclipse.jdt.ui.wizards.NewAnnotationCreationWizard" ); //$NON-NLS-1$
+ layout.addNewWizardShortcut( "org.eclipse.jdt.ui.wizards.NewSourceFolderCreationWizard" ); //$NON-NLS-1$
+ layout.addNewWizardShortcut( "org.eclipse.jdt.ui.wizards.NewSnippetFileCreationWizard" ); //$NON-NLS-1$
+ layout.addNewWizardShortcut( "org.eclipse.jdt.ui.wizards.NewJavaWorkingSetWizard" ); //$NON-NLS-1$
+ layout.addNewWizardShortcut( "org.eclipse.ui.wizards.new.folder" );//$NON-NLS-1$
+ layout.addNewWizardShortcut( "org.eclipse.ui.wizards.new.file" );//$NON-NLS-1$
+ layout.addNewWizardShortcut( "org.eclipse.ui.editors.wizards.UntitledTextFileWizard" );//$NON-NLS-1$
+
+ layout.addNewWizardShortcut( "org.cauldron.sigil.editors.newCompositeWizard" );
+ layout.addNewWizardShortcut( "org.cauldron.sigil.editors.newSystemWizard" );
+ layout.addNewWizardShortcut( "org.cauldron.sigil.editors.newProjectWizard" );
+ }
}
Modified: felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/ExcludedResourcesPrefsPage.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/ExcludedResourcesPrefsPage.java?rev=796467&r1=796466&r2=796467&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/ExcludedResourcesPrefsPage.java (original)
+++ felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/ExcludedResourcesPrefsPage.java Tue Jul 21 18:51:33 2009
@@ -19,6 +19,7 @@
package org.apache.felix.sigil.ui.eclipse.ui.preferences;
+
import java.util.ArrayList;
import java.util.Iterator;
@@ -48,122 +49,153 @@
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;
-public class ExcludedResourcesPrefsPage extends PreferencePage implements IWorkbenchPreferencePage {
-
- private TableViewer viewer;
- private IWorkbench workbench;
- private ArrayList<String> resources;
-
- public ExcludedResourcesPrefsPage() {
- super();
- setDescription("Specify resources that should not be offered for inclusion in a generated bundle.");
- }
-
- @Override
- protected Control createContents(Composite parent) {
- // Create controls
- Composite composite = new Composite(parent, SWT.NONE);
- Table table = new Table(composite, SWT.BORDER | SWT.MULTI | SWT.FULL_SELECTION);
-
- Button btnAdd = new Button(composite, SWT.PUSH);
- btnAdd.setText("Add");
-
- final Button btnRemove = new Button(composite, SWT.PUSH);
- btnRemove.setText("Remove");
- btnRemove.setEnabled(false);
-
- // Create viewer
- viewer = new TableViewer(table);
- viewer.setContentProvider(new ArrayContentProvider());
-
- // Load data
- loadPreferences(false);
- viewer.setInput(resources);
-
- // Listeners
- viewer.addSelectionChangedListener(new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event) {
- btnRemove.setEnabled(!viewer.getSelection().isEmpty());
- }
- });
-
- btnRemove.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
- Object[] deleted = selection.toArray();
- for(Object delete : deleted) {
- resources.remove(delete);
- }
- viewer.remove(deleted);
- }
- });
-
- btnAdd.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- InputDialog dialog = new InputDialog(getShell(), "Add Resource", "Enter resource name", "", new IInputValidator() {
- public String isValid(String newText) {
- String error = null;
- if(newText == null || newText.length() == 0) {
- error = "Name must not be empty.";
- } else if(resources.contains(newText)) {
- error = "Specified resource name is already on the list.";
- }
- return error;
- }
- });
-
- if(dialog.open() == Window.OK) {
- String value = dialog.getValue();
- resources.add(value);
- viewer.add(value);
- }
- }
- });
-
- // Layout
- composite.setLayout(new GridLayout(2, false));
- table.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 3));
- btnAdd.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
- btnRemove.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
-
- return composite;
- }
-
- private void loadPreferences(boolean useDefaults) {
- String resourcesListStr = useDefaults
- ? getPreferenceStore().getDefaultString(SigilCore.DEFAULT_EXCLUDED_RESOURCES)
- : getPreferenceStore().getString(SigilCore.DEFAULT_EXCLUDED_RESOURCES);
- String[] resourcesArray = PrefsUtils.stringToArray(resourcesListStr);
-
- resources = new ArrayList<String>(resourcesArray.length);
- for (String resource : resourcesArray) {
- resources.add(resource);
- }
- }
-
- public void init(IWorkbench workbench) {
- this.workbench = workbench;
- }
-
- @Override
- protected IPreferenceStore doGetPreferenceStore() {
- return SigilCore.getDefault().getPreferenceStore();
- }
-
- @Override
- public boolean performOk() {
- String resourcesStr = PrefsUtils.arrayToString(resources.toArray(new String[resources.size()]));
- getPreferenceStore().setValue(SigilCore.DEFAULT_EXCLUDED_RESOURCES, resourcesStr);
- return true;
- }
-
- @Override
- protected void performDefaults() {
- super.performDefaults();
- loadPreferences(true);
- viewer.setInput(resources);
- }
+
+public class ExcludedResourcesPrefsPage extends PreferencePage implements IWorkbenchPreferencePage
+{
+
+ private TableViewer viewer;
+ private IWorkbench workbench;
+ private ArrayList<String> resources;
+
+
+ public ExcludedResourcesPrefsPage()
+ {
+ super();
+ setDescription( "Specify resources that should not be offered for inclusion in a generated bundle." );
+ }
+
+
+ @Override
+ protected Control createContents( Composite parent )
+ {
+ // Create controls
+ Composite composite = new Composite( parent, SWT.NONE );
+ Table table = new Table( composite, SWT.BORDER | SWT.MULTI | SWT.FULL_SELECTION );
+
+ Button btnAdd = new Button( composite, SWT.PUSH );
+ btnAdd.setText( "Add" );
+
+ final Button btnRemove = new Button( composite, SWT.PUSH );
+ btnRemove.setText( "Remove" );
+ btnRemove.setEnabled( false );
+
+ // Create viewer
+ viewer = new TableViewer( table );
+ viewer.setContentProvider( new ArrayContentProvider() );
+
+ // Load data
+ loadPreferences( false );
+ viewer.setInput( resources );
+
+ // Listeners
+ viewer.addSelectionChangedListener( new ISelectionChangedListener()
+ {
+ public void selectionChanged( SelectionChangedEvent event )
+ {
+ btnRemove.setEnabled( !viewer.getSelection().isEmpty() );
+ }
+ } );
+
+ btnRemove.addSelectionListener( new SelectionAdapter()
+ {
+ @Override
+ public void widgetSelected( SelectionEvent e )
+ {
+ IStructuredSelection selection = ( IStructuredSelection ) viewer.getSelection();
+ Object[] deleted = selection.toArray();
+ for ( Object delete : deleted )
+ {
+ resources.remove( delete );
+ }
+ viewer.remove( deleted );
+ }
+ } );
+
+ btnAdd.addSelectionListener( new SelectionAdapter()
+ {
+ @Override
+ public void widgetSelected( SelectionEvent e )
+ {
+ InputDialog dialog = new InputDialog( getShell(), "Add Resource", "Enter resource name", "",
+ new IInputValidator()
+ {
+ public String isValid( String newText )
+ {
+ String error = null;
+ if ( newText == null || newText.length() == 0 )
+ {
+ error = "Name must not be empty.";
+ }
+ else if ( resources.contains( newText ) )
+ {
+ error = "Specified resource name is already on the list.";
+ }
+ return error;
+ }
+ } );
+
+ if ( dialog.open() == Window.OK )
+ {
+ String value = dialog.getValue();
+ resources.add( value );
+ viewer.add( value );
+ }
+ }
+ } );
+
+ // Layout
+ composite.setLayout( new GridLayout( 2, false ) );
+ table.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true, 1, 3 ) );
+ btnAdd.setLayoutData( new GridData( SWT.FILL, SWT.FILL, false, false ) );
+ btnRemove.setLayoutData( new GridData( SWT.FILL, SWT.FILL, false, false ) );
+
+ return composite;
+ }
+
+
+ private void loadPreferences( boolean useDefaults )
+ {
+ String resourcesListStr = useDefaults ? getPreferenceStore().getDefaultString(
+ SigilCore.DEFAULT_EXCLUDED_RESOURCES ) : getPreferenceStore().getString(
+ SigilCore.DEFAULT_EXCLUDED_RESOURCES );
+ String[] resourcesArray = PrefsUtils.stringToArray( resourcesListStr );
+
+ resources = new ArrayList<String>( resourcesArray.length );
+ for ( String resource : resourcesArray )
+ {
+ resources.add( resource );
+ }
+ }
+
+
+ public void init( IWorkbench workbench )
+ {
+ this.workbench = workbench;
+ }
+
+
+ @Override
+ protected IPreferenceStore doGetPreferenceStore()
+ {
+ return SigilCore.getDefault().getPreferenceStore();
+ }
+
+
+ @Override
+ public boolean performOk()
+ {
+ String resourcesStr = PrefsUtils.arrayToString( resources.toArray( new String[resources.size()] ) );
+ getPreferenceStore().setValue( SigilCore.DEFAULT_EXCLUDED_RESOURCES, resourcesStr );
+ return true;
+ }
+
+
+ @Override
+ protected void performDefaults()
+ {
+ super.performDefaults();
+ loadPreferences( true );
+ viewer.setInput( resources );
+ }
}