Improve setup related models; use workspace version of preferences only if accessible

1 files changed, 15 insertions, 11 deletions

diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.editor/src/org/eclipse/emf/cdo/releng/setup/presentation/SetupEditor.java b/plugins/org.eclipse.emf.cdo.releng.setup.editor/src/org/eclipse/emf/cdo/releng/setup/presentation/SetupEditor.java
index 70a9f91526..e690f3e45b 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.editor/src/org/eclipse/emf/cdo/releng/setup/presentation/SetupEditor.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.editor/src/org/eclipse/emf/cdo/releng/setup/presentation/SetupEditor.java
@@ -178,7 +178,7 @@ import java.util.Set;
  * @generated
  */
 public class SetupEditor extends MultiPageEditorPart implements IEditingDomainProvider, ISelectionProvider,
-    IMenuListener, IViewerProvider, IGotoMarker
+IMenuListener, IViewerProvider, IGotoMarker
 {
   private static final Object VARIABLE_GROUP_IMAGE = SetupEditorPlugin.INSTANCE.getImage("full/obj16/VariableGroup");
 
@@ -850,13 +850,13 @@ public class SetupEditor extends MultiPageEditorPart implements IEditingDomainPr
     editingDomain = new AdapterFactoryEditingDomain(adapterFactory, editingDomain.getCommandStack(),
         new HashMap<Resource, Boolean>()
         {
-          private static final long serialVersionUID = 1L;
+      private static final long serialVersionUID = 1L;
 
-          @Override
-          public Boolean get(Object key)
-          {
-            return !editingDomain.getResourceSet().getResources().contains(key) ? Boolean.TRUE : super.get(key);
-          }
+      @Override
+      public Boolean get(Object key)
+      {
+        return !editingDomain.getResourceSet().getResources().contains(key) ? Boolean.TRUE : super.get(key);
+      }
         });
 
     EMFUtil.configureResourceSet(editingDomain.getResourceSet());
@@ -1189,7 +1189,7 @@ public class SetupEditor extends MultiPageEditorPart implements IEditingDomainPr
       selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
       selectionViewer.setLabelProvider(new DecoratingColumLabelProvider(new SetupLabelProvider(adapterFactory,
           selectionViewer), new DiagnosticDecorator(editingDomain, selectionViewer, SetupEditorPlugin.getPlugin()
-          .getDialogSettings())));
+              .getDialogSettings())));
 
       Resource resource = editingDomain.getResourceSet().getResources().get(0);
       selectionViewer.setInput(resource);
@@ -2120,7 +2120,7 @@ public class SetupEditor extends MultiPageEditorPart implements IEditingDomainPr
     setPartName(editorInput.getName());
     IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null ? getActionBars()
         .getStatusLineManager().getProgressMonitor() : new NullProgressMonitor();
-    doSave(progressMonitor);
+        doSave(progressMonitor);
   }
 
   /**
@@ -2423,9 +2423,13 @@ public class SetupEditor extends MultiPageEditorPart implements IEditingDomainPr
           {
             IFile[] files = ResourcesPlugin.getWorkspace().getRoot()
                 .findFilesForLocationURI(new java.net.URI(normalizedURI.toString()));
-            if (files.length > 0)
+            for (IFile file : files)
             {
-              editorInput = new FileEditorInput(files[0]);
+              if (file.isAccessible())
+              {
+                editorInput = new FileEditorInput(files[0]);
+                break;
+              }
             }
           }