From 49f9fe8f8997293590d4f6a2314a5565c57ecbaa Mon Sep 17 00:00:00 2001 From: Eike Stepper Date: Fri, 20 Mar 2015 11:36:06 +0100 Subject: [458349] Consolidate UI Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=458349--- .../ui/checkouts/actions/ShowInActionProvider.java | 2 +- .../repositories/wizards/RepositoryLocalPage.java | 4 +-- .../cdo/explorer/repositories/CDORepository.java | 10 ++++-- .../explorer/repositories/CDORepositoryImpl.java | 40 +++++++++++++++++++--- .../repositories/CDORepositoryManagerImpl.java | 2 ++ 5 files changed, 48 insertions(+), 10 deletions(-) diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/ShowInActionProvider.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/ShowInActionProvider.java index 94ff1e0914..052d6d3efa 100644 --- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/ShowInActionProvider.java +++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/ShowInActionProvider.java @@ -94,7 +94,7 @@ public class ShowInActionProvider extends AbstractActionProvider int dashBoardHeight = OM.PREF_DASHBOARD_HEIGHT.getValue(); if (dashBoardHeight >= 0) { - showDashboard(getViewer(), getViewSite().getPage()); + // showDashboard(getViewer(), getViewSite().getPage()); } } diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/repositories/wizards/RepositoryLocalPage.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/repositories/wizards/RepositoryLocalPage.java index 6ccd089487..067e3ffbdf 100644 --- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/repositories/wizards/RepositoryLocalPage.java +++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/repositories/wizards/RepositoryLocalPage.java @@ -105,7 +105,7 @@ public class RepositoryLocalPage extends AbstractRepositoryPage Group modeGroup = new Group(composite, SWT.NONE); modeGroup.setLayout(new GridLayout(1, false)); - modeGroup.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_BEGINNING)); + modeGroup.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL)); modeGroup.setText("Versioning Mode"); normalButton = new Button(modeGroup, SWT.RADIO); @@ -123,7 +123,7 @@ public class RepositoryLocalPage extends AbstractRepositoryPage Group idGroup = new Group(composite, SWT.NONE); idGroup.setLayout(new GridLayout(1, false)); - idGroup.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_BEGINNING)); + idGroup.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL)); idGroup.setText("ID Generation"); counterButton = new Button(idGroup, SWT.RADIO); diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/repositories/CDORepository.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/repositories/CDORepository.java index 7d8b9bcf93..ab73a7679d 100644 --- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/repositories/CDORepository.java +++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/repositories/CDORepository.java @@ -20,6 +20,8 @@ import org.eclipse.emf.cdo.transaction.CDOTransactionOpener; import org.eclipse.emf.cdo.view.CDOViewOpener; import org.eclipse.net4j.util.container.IContainer; +import org.eclipse.net4j.util.security.IPasswordCredentials; +import org.eclipse.net4j.util.security.IPasswordCredentialsProvider2; /** * A CDO server independent representation of a repository. @@ -27,8 +29,8 @@ import org.eclipse.net4j.util.container.IContainer; * @author Eike Stepper * @since 4.4 */ -public interface CDORepository extends CDOExplorerElement, IContainer, CDOSessionProvider, CDOViewOpener, - CDOTransactionOpener +public interface CDORepository extends CDOExplorerElement, IContainer, IPasswordCredentialsProvider2, + CDOSessionProvider, CDOViewOpener, CDOTransactionOpener { public static final String TYPE_REMOTE = "remote"; @@ -54,6 +56,10 @@ public interface CDORepository extends CDOExplorerElement, IContainer public IDGeneration getIDGeneration(); + public IPasswordCredentials getCredentials(); + + public void setCredentials(IPasswordCredentials credentials); + public State getState(); public boolean isConnected(); diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryImpl.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryImpl.java index 96c5d92400..1bfa484e57 100644 --- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryImpl.java +++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryImpl.java @@ -41,6 +41,7 @@ import org.eclipse.net4j.util.event.IEvent; import org.eclipse.net4j.util.event.IListener; import org.eclipse.net4j.util.lifecycle.ILifecycle; import org.eclipse.net4j.util.lifecycle.LifecycleEventAdapter; +import org.eclipse.net4j.util.security.IPasswordCredentials; import org.eclipse.emf.ecore.resource.ResourceSet; @@ -57,6 +58,8 @@ public abstract class CDORepositoryImpl extends AbstractElement implements CDORe { public static final String PROP_NAME = "name"; + public static final String PROP_REALM = "realm"; + public static final String REPOSITORY_KEY = CDORepository.class.getName(); private final Set checkouts = new HashSet(); @@ -111,6 +114,8 @@ public abstract class CDORepositoryImpl extends AbstractElement implements CDORe private CDORepository.IDGeneration idGeneration; + private String realm; + private State state = State.Disconnected; private boolean explicitelyConnected; @@ -153,6 +158,25 @@ public abstract class CDORepositoryImpl extends AbstractElement implements CDORe return idGeneration; } + public IPasswordCredentials getCredentials() + { + return getCredentials(null); + } + + public IPasswordCredentials getCredentials(String realm) + { + return null; + } + + public void setCredentials(IPasswordCredentials credentials) + { + } + + public boolean isInteractive() + { + return false; + } + public final State getState() { return state; @@ -481,9 +505,9 @@ public abstract class CDORepositoryImpl extends AbstractElement implements CDORe { super.init(folder, type, properties); name = properties.getProperty(PROP_NAME); - versioningMode = CDORepository.VersioningMode.valueOf(properties - .getProperty(CDORepositoryImpl.PROP_VERSIONING_MODE)); - idGeneration = CDORepository.IDGeneration.valueOf(properties.getProperty(CDORepositoryImpl.PROP_ID_GENERATION)); + versioningMode = VersioningMode.valueOf(properties.getProperty(PROP_VERSIONING_MODE)); + idGeneration = IDGeneration.valueOf(properties.getProperty(PROP_ID_GENERATION)); + realm = properties.getProperty(PROP_REALM); } @Override @@ -491,8 +515,13 @@ public abstract class CDORepositoryImpl extends AbstractElement implements CDORe { super.collectProperties(properties); properties.setProperty(PROP_NAME, name); - properties.setProperty(CDORepositoryImpl.PROP_VERSIONING_MODE, versioningMode.toString()); - properties.setProperty(CDORepositoryImpl.PROP_ID_GENERATION, idGeneration.toString()); + properties.setProperty(PROP_VERSIONING_MODE, versioningMode.toString()); + properties.setProperty(PROP_ID_GENERATION, idGeneration.toString()); + + if (realm != null) + { + properties.setProperty(PROP_REALM, realm); + } } protected IConnector getConnector() @@ -516,6 +545,7 @@ public abstract class CDORepositoryImpl extends AbstractElement implements CDORe CDOSessionConfiguration sessionConfiguration = createSessionConfiguration(); sessionConfiguration.setPassiveUpdateEnabled(true); sessionConfiguration.setPassiveUpdateMode(PassiveUpdateMode.CHANGES); + sessionConfiguration.setCredentialsProvider(this); CDOSession session = sessionConfiguration.openSession(); session.options().setGeneratedPackageEmulationEnabled(true); diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryManagerImpl.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryManagerImpl.java index f8fa77ea0d..2bdee9fcae 100644 --- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryManagerImpl.java +++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryManagerImpl.java @@ -27,6 +27,8 @@ import java.util.concurrent.ConcurrentHashMap; */ public class CDORepositoryManagerImpl extends AbstractManager implements CDORepositoryManager { + public static final String SECURE_STORE_PATH = "/CDO/repositories"; + private static final String PROPERTIES_FILE = "repository.properties"; private final Map sessionMap = new ConcurrentHashMap(); -- cgit v1.2.3