summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Pielmann2012-10-11 08:04:18 (EDT)
committer Manik Kishore2012-10-11 08:04:18 (EDT)
commit2fa98a14a81d49ba90dcd06353f44dad039fffbf (patch)
tree485e01c14d868c85564aac0514ef207e8f3de56c
parentd8b8adbd6a00ed19e8fd311f732940ec8f469002 (diff)
downloadorg.eclipse.stardust.ide-2fa98a14a81d49ba90dcd06353f44dad039fffbf.zip
org.eclipse.stardust.ide-2fa98a14a81d49ba90dcd06353f44dad039fffbf.tar.gz
org.eclipse.stardust.ide-2fa98a14a81d49ba90dcd06353f44dad039fffbf.tar.bz2
Jira-ID: CRNT-26613
Model Import Wizard shows "Infinity XML" selectable in combo box git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ide@59946 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--modeling/org.eclipse.stardust.modeling.modelimport/plugin.xml2
-rw-r--r--modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/ImportModelWizardPage.java8
-rw-r--r--modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/elements/ImportModelElementsWizardPage.java28
3 files changed, 19 insertions, 19 deletions
diff --git a/modeling/org.eclipse.stardust.modeling.modelimport/plugin.xml b/modeling/org.eclipse.stardust.modeling.modelimport/plugin.xml
index 53961e3..a37c42d 100644
--- a/modeling/org.eclipse.stardust.modeling.modelimport/plugin.xml
+++ b/modeling/org.eclipse.stardust.modeling.modelimport/plugin.xml
@@ -48,7 +48,7 @@
point="org.eclipse.stardust.modeling.modelimport.thirdPartyModelImport">
<modelImportType
id="carnotXml"
- name="Infinity XML"
+ name="Process Model File"
class="org.eclipse.stardust.modeling.modelimport.carnot.CarnotXmlSourceGroupProvider" />
<modelImportType
class="org.eclipse.stardust.modeling.modelimport.carnot.audittrail.CarnotAuditTrailSourceGroupProvider"
diff --git a/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/ImportModelWizardPage.java b/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/ImportModelWizardPage.java
index 18af3cb..7e225f4 100644
--- a/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/ImportModelWizardPage.java
+++ b/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/ImportModelWizardPage.java
@@ -262,7 +262,7 @@ public class ImportModelWizardPage extends WizardResourceImportPage
}
}
-
+
private void createAdvancedExpandedComposite(Composite parent)
{
Composite advancedComp = new Composite(parent, SWT.NONE);
@@ -333,7 +333,7 @@ public class ImportModelWizardPage extends WizardResourceImportPage
modelTypsCombo.addSelectionListener(listener);
IConfigurationElement firstConfig = (IConfigurationElement) ImportPlugin
- .getExtensions().get("Infinity XML"); //$NON-NLS-1$
+ .getExtensions().get("Process Model File"); //$NON-NLS-1$
modelTypsCombo.add(firstConfig.getAttribute(SpiConstants.NAME));
for (Iterator _iterator = ImportPlugin.getExtensions().keySet().iterator(); _iterator
.hasNext();)
@@ -410,7 +410,7 @@ public class ImportModelWizardPage extends WizardResourceImportPage
/**
* create the file path and check if file already exists
- *
+ *
* @return
*/
public boolean checkFileExists()
@@ -556,7 +556,7 @@ public class ImportModelWizardPage extends WizardResourceImportPage
// cache the selected source group provider
sourceGroupProvider = (ISourceGroupProvider) ImportPlugin
.getSourceGroupProviders().get(key);
-
+
sourceGroupLayout.topControl = sourceGroupControl;
additionalOptionsControl.setVisible(true);
diff --git a/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/elements/ImportModelElementsWizardPage.java b/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/elements/ImportModelElementsWizardPage.java
index d14805d..2e59e19 100644
--- a/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/elements/ImportModelElementsWizardPage.java
+++ b/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/elements/ImportModelElementsWizardPage.java
@@ -66,7 +66,7 @@ public class ImportModelElementsWizardPage extends WizardDataTransferPage
private Map<String, Control> sourceGroupControls;
private Map<String, Control> advancedExpandableControls;
-
+
private StackLayout advancedExpandableGroupLayout;
private StackLayout layout;
@@ -105,14 +105,14 @@ public class ImportModelElementsWizardPage extends WizardDataTransferPage
public boolean canFlipToNextPage()
{
- return isPageComplete();
+ return isPageComplete();
}
public IWizardPage getNextPage()
{
try
{
- getInput();
+ getInput();
}
catch (Exception ex)
{
@@ -146,7 +146,7 @@ public class ImportModelElementsWizardPage extends WizardDataTransferPage
super.setVisible(visible);
}
}
-
+
public void updateButtons()
{
if (getWizard().getContainer().getCurrentPage() != null)
@@ -193,7 +193,7 @@ public class ImportModelElementsWizardPage extends WizardDataTransferPage
createSourceGroup(composite);
createOptionsGroup(composite);
-
+
createAdvancedExpandedComposite(composite);
setPageComplete(determinePageCompletion());
@@ -250,7 +250,7 @@ public class ImportModelElementsWizardPage extends WizardDataTransferPage
// TODO: replace with CARNOT EXP specific image
setImageDescriptor(WorkbenchImages.getImageDescriptor(IWorkbenchGraphicConstants.IMG_WIZBAN_IMPORT_WIZ));
}
-
+
private void createAdvancedExpandedComposite(Composite parent)
{
Composite advancedComp = new Composite(parent, SWT.NONE);
@@ -265,7 +265,7 @@ public class ImportModelElementsWizardPage extends WizardDataTransferPage
advancedExpandableGroupLayout = new StackLayout();
advancedExpandableGroupLayout.marginHeight = 5;
advancedComp.setLayout(advancedExpandableGroupLayout);
-
+
advancedExpandableControls = new HashMap<String, Control>();
@SuppressWarnings("unchecked")
Map<String, ISourceGroupProvider> sourceGroupProviders = ImportPlugin.getSourceGroupProviders();
@@ -328,7 +328,7 @@ public class ImportModelElementsWizardPage extends WizardDataTransferPage
@SuppressWarnings("unchecked")
Map<String, IConfigurationElement> extensions = ImportPlugin.getExtensions();
- IConfigurationElement firstConfig = (IConfigurationElement) extensions.get("Infinity XML"); //$NON-NLS-1$
+ IConfigurationElement firstConfig = (IConfigurationElement) extensions.get("Process Model File"); //$NON-NLS-1$
modelTypsCombo.add(firstConfig.getAttribute(SpiConstants.NAME));
for (IConfigurationElement config : extensions.values())
{
@@ -344,7 +344,7 @@ public class ImportModelElementsWizardPage extends WizardDataTransferPage
public boolean isPageComplete()
{
boolean pageIsValid = true;
-
+
// no external file to import is selected
if (sourceGroupProvider != null && !sourceGroupProvider.isComplete())
{
@@ -354,7 +354,7 @@ public class ImportModelElementsWizardPage extends WizardDataTransferPage
{
pageIsValid = isValidResource();
}
-
+
// no destination location is selected
if (getResourcePath() == null)
{
@@ -388,7 +388,7 @@ public class ImportModelElementsWizardPage extends WizardDataTransferPage
.getSourceGroupProviders().get(key);
layout.topControl = sourceGroupControl;
-
+
if (advancedExpandableControl != null)
{
advancedExpandableControl.setVisible(true);
@@ -411,7 +411,7 @@ public class ImportModelElementsWizardPage extends WizardDataTransferPage
{
return sourceGroupProvider;
}
-
+
public MergeEditorInput getInput()
{
if (input == null)
@@ -436,8 +436,8 @@ public class ImportModelElementsWizardPage extends WizardDataTransferPage
return false;
}
return true;
- }
-
+ }
+
private void prepareInput()
{
Resource source = sourceGroupProvider.getExternalResource();