Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrescobar2010-07-22 18:36:40 -0400
committerrescobar2010-07-22 18:36:40 -0400
commitc2fa98a193a7d68e2ad9fda1b3b799d08bfbcfd2 (patch)
tree3c2c6c59229ec72cac60803243f82feed4ec8550 /plugins
parent83440b6b96ffdfcd12de6c4b28245921c3b27eef (diff)
downloadorg.eclipse.osee-c2fa98a193a7d68e2ad9fda1b3b799d08bfbcfd2.tar.gz
org.eclipse.osee-c2fa98a193a7d68e2ad9fda1b3b799d08bfbcfd2.tar.xz
org.eclipse.osee-c2fa98a193a7d68e2ad9fda1b3b799d08bfbcfd2.zip
Access Control Updates
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.integration/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/ModelUtil.java11
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/wizards/NewOseeTypesFilePage.java3
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/wizards/OseeTypesImportPage.java3
4 files changed, 12 insertions, 6 deletions
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.core.dsl.integration/META-INF/MANIFEST.MF
index 5cf00e7273e..5f9bf02ac69 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.integration/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.core.dsl.integration/META-INF/MANIFEST.MF
@@ -26,5 +26,6 @@ Require-Bundle: org.eclipse.osee.framework.core.dsl,
org.eclipse.emf.ecore,
org.eclipse.emf.common,
org.eclipse.xtext
+Eclipse-ExtensibleAPI: true
Bundle-Activator: org.eclipse.osee.framework.core.dsl.integration.internal.Activator
Export-Package: org.eclipse.osee.framework.core.dsl.integration
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/ModelUtil.java b/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/ModelUtil.java
index 74048f49983..46ecfb0eff2 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/ModelUtil.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/ModelUtil.java
@@ -31,6 +31,7 @@ import org.eclipse.osee.framework.core.dsl.oseeDsl.OseeDsl;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeStateException;
import org.eclipse.osee.framework.core.exception.OseeWrappedException;
+import org.eclipse.xtext.resource.SaveOptions;
import org.eclipse.xtext.resource.XtextResource;
import org.eclipse.xtext.resource.XtextResourceSet;
import com.google.inject.Injector;
@@ -131,8 +132,9 @@ public final class ModelUtil {
resource.getContents().add(model);
Map<String, Boolean> options = new HashMap<String, Boolean>();
- options.put(XtextResource.OPTION_FORMAT, Boolean.TRUE);
- resource.save(options);
+ // options.put(XtextResource.OPTION_FORMAT, Boolean.TRUE);
+ SaveOptions saveOptions = SaveOptions.getOptions(options);
+ resource.save(saveOptions.toOptionsMap());
}
public static void saveModel(OseeDsl model, String uri, OutputStream outputStream, boolean isZipped) throws IOException {
@@ -143,11 +145,12 @@ public final class ModelUtil {
resource.getContents().add(model);
Map<String, Boolean> options = new HashMap<String, Boolean>();
- options.put(XtextResource.OPTION_FORMAT, Boolean.TRUE);
+ // options.put(XtextResource.OPTION_FORMAT, Boolean.TRUE);
if (isZipped) {
options.put(XtextResource.OPTION_ZIP, Boolean.TRUE);
}
- resource.save(outputStream, options);
+ SaveOptions saveOptions = SaveOptions.getOptions(options);
+ resource.save(outputStream, saveOptions.toOptionsMap());
}
private static void storeModel(OutputStream outputStream, EObject object, String uri, Map<String, Boolean> options) throws OseeCoreException {
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/wizards/NewOseeTypesFilePage.java b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/wizards/NewOseeTypesFilePage.java
index abbef407f49..3c7b55c614c 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/wizards/NewOseeTypesFilePage.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/wizards/NewOseeTypesFilePage.java
@@ -26,7 +26,8 @@ import org.eclipse.swt.widgets.Event;
import org.eclipse.ui.dialogs.WizardDataTransferPage;
public class NewOseeTypesFilePage extends WizardDataTransferPage {
- private static final String PAGE_NAME = "org.eclipse.osee.framework.types.bridge.wizards.NewOseeTypeFilePage";
+ private static final String PAGE_NAME =
+ "org.eclipse.osee.framework.core.dsl.ui.integration.wizards.NewOseeTypeFilePage";
private DirectoryOrFileSelector sourceFileSelector;
private DirectoryOrFileSelector destinationFileSelector;
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/wizards/OseeTypesImportPage.java b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/wizards/OseeTypesImportPage.java
index a134680e875..723f6c6d96e 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/wizards/OseeTypesImportPage.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/wizards/OseeTypesImportPage.java
@@ -50,7 +50,8 @@ import org.eclipse.xtext.resource.ClassloaderClasspathUriResolver;
* @author Roberto E. Escobar
*/
public class OseeTypesImportPage extends WizardDataTransferPage {
- private static final String PAGE_NAME = "org.eclipse.osee.framework.types.bridge.wizards.OseeTypesImportPage";
+ private static final String PAGE_NAME =
+ "org.eclipse.osee.framework.core.dsl.ui.integration.wizards.OseeTypesImportPage";
private final OseeTypesSetup oseeTypesSetup;
private File compositeFile;

Back to the top