Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian W. Damus2013-10-11 08:57:48 +0000
committerChristian W. Damus2013-10-11 08:57:48 +0000
commite18bd9ffbce86944b1fd595a9a1e18438fb143e2 (patch)
tree6188f5dfb0fbf4d9aada0c5333d1e41c634e265d /extraplugins
parent6d709348490b8eeb9b109a17edd29e32d55a331b (diff)
downloadorg.eclipse.papyrus-e18bd9ffbce86944b1fd595a9a1e18438fb143e2.tar.gz
org.eclipse.papyrus-e18bd9ffbce86944b1fd595a9a1e18438fb143e2.tar.xz
org.eclipse.papyrus-e18bd9ffbce86944b1fd595a9a1e18438fb143e2.zip
Revert "415375: [CDO] Model repository administration"
Diffstat (limited to 'extraplugins')
-rw-r--r--extraplugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/PapyrusRepository.java2
-rw-r--r--extraplugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/DIResourceQuery.java8
2 files changed, 1 insertions, 9 deletions
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/PapyrusRepository.java b/extraplugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/PapyrusRepository.java
index fd19e6edf68..23bc477a31a 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/PapyrusRepository.java
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/PapyrusRepository.java
@@ -692,8 +692,6 @@ public class PapyrusRepository extends Container<CDOResourceNode> implements IIn
if((view != null) && !view.isClosed()) {
result = view.getRootResource();
}
- } else if(adapter == CDOSession.class) {
- result = getCDOSession();
} else {
result = Platform.getAdapterManager().getAdapter(this, adapter);
}
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/DIResourceQuery.java b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/DIResourceQuery.java
index 9e9e7ae8aa8..8feb2644190 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/DIResourceQuery.java
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/DIResourceQuery.java
@@ -204,7 +204,6 @@ public class DIResourceQuery {
private IListener createCDOViewListener() {
return new IListener() {
- @Override
public void notifyEvent(IEvent event) {
if(event instanceof ILifecycleEvent) {
ILifecycleEvent lifecycleEvent = (ILifecycleEvent)event;
@@ -224,7 +223,6 @@ public class DIResourceQuery {
private DisposeListener createViewerDisposeListener() {
return new DisposeListener() {
- @Override
public void widgetDisposed(DisposeEvent e) {
dispose();
}
@@ -276,7 +274,6 @@ public class DIResourceQuery {
if(display != null) {
display.asyncExec(new Runnable() {
- @Override
public void run() {
if((viewer != null) && (viewer.getControl() != null) && !viewer.getControl().isDisposed()) {
refresh();
@@ -296,10 +293,7 @@ public class DIResourceQuery {
CDOResourceFolder folder = resource.getFolder();
if(folder != null) {
- // if we don't have read permission on the folder, then we shouldn't attempt to show any contents
- if(folder.cdoPermission().isReadable()) {
- result = folder.getNodes().contains(resource);
- }
+ result = folder.getNodes().contains(resource);
} else {
CDOResource root = resource.cdoResource();
if((root != null) && root.isRoot()) {

Back to the top