Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/customization')
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src/org/eclipse/papyrus/customization/properties/model/xwt/resource/XWTResource.java8
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization.properties/Query/Contexts.querySet2
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/CustomizationDialog.java5
3 files changed, 13 insertions, 2 deletions
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src/org/eclipse/papyrus/customization/properties/model/xwt/resource/XWTResource.java b/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src/org/eclipse/papyrus/customization/properties/model/xwt/resource/XWTResource.java
index 79640834d13..e64a0185f01 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src/org/eclipse/papyrus/customization/properties/model/xwt/resource/XWTResource.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src/org/eclipse/papyrus/customization/properties/model/xwt/resource/XWTResource.java
@@ -92,7 +92,11 @@ public class XWTResource extends ResourceImpl {
Root root = (Root)xmlResource.getContents().get(0);
try {
CompositeWidget widget = xmlToUISection(root);
- getContents().add(widget);
+ if(widget == null) {
+ Activator.log.warn("Cannot load the XWT Widget");
+ } else {
+ getContents().add(widget);
+ }
} catch (Exception ex) {
Activator.log.error(ex);
}
@@ -186,7 +190,9 @@ public class XWTResource extends ResourceImpl {
} else {
IStatus status = BasicDiagnostic.toIStatus(result);
Activator.getDefault().getLog().log(status);
+ Activator.log.error(status.getException());
}
+
return null;
}
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Query/Contexts.querySet b/plugins/customization/org.eclipse.papyrus.customization.properties/Query/Contexts.querySet
index 7bf736b16da..aea3810087c 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Query/Contexts.querySet
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties/Query/Contexts.querySet
@@ -46,7 +46,7 @@
<returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
<scope href="http://www.eclipse.org/papyrus/properties/contexts/0.9#//Context"/>
</queries>
- <queries xsi:type="query:OCLModelQuery" name="showDataContext" description="Blabla" lowerBound="1" query="true">
+ <queries xsi:type="query:OCLModelQuery" name="showDataContext" description="" lowerBound="1" query="true">
<returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
<scope href="http://www.eclipse.org/papyrus/properties/contexts/0.9#//Context"/>
</queries>
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/CustomizationDialog.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/CustomizationDialog.java
index 439415d7a60..17861495a83 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/CustomizationDialog.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/CustomizationDialog.java
@@ -272,4 +272,9 @@ public class CustomizationDialog extends TrayDialog implements SelectionListener
}
}
}
+
+ @Override
+ public boolean isResizable() {
+ return true;
+ }
}

Back to the top