Skip to content
Snippets Groups Projects
Commit 6a06fa0c authored by Erlend Stav's avatar Erlend Stav
Browse files

Updated with some simplifications

parent 89809533
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
dashboard/org.universaal.tools.dashboard/src/org/universaal/tools/dashboard/views/ApplicationView.java
+ 5
− 3
View file @ 6a06fa0c
......@@ -129,14 +129,16 @@ public class ApplicationView extends Composite {
btnCombine = new Button(composite_2, SWT.NONE);
btnCombine.setEnabled(false);
btnCombine.setText("Combine");
btnCombine.setText("Package");
Group grpPublishableOntology = new Group(this, SWT.BORDER);
grpPublishableOntology.setFont(SWTResourceManager.getFont("Lucida Grande", 11, SWT.BOLD));
grpPublishableOntology.setBackground(SWTResourceManager.getColor(135, 206, 250));
grpPublishableOntology.setLayout(new FillLayout(SWT.VERTICAL));
grpPublishableOntology.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false, 1, 2));
grpPublishableOntology.setText("Publishable Ontology");
GridData gd_grpPublishableOntology = new GridData(SWT.LEFT, SWT.CENTER, false, false, 1, 2);
gd_grpPublishableOntology.widthHint = 154;
grpPublishableOntology.setLayoutData(gd_grpPublishableOntology);
grpPublishableOntology.setText("Publishable Application");
btnPublishToUStore = new Button(grpPublishableOntology, SWT.NONE);
btnPublishToUStore.setText("Publish to uStore");
......
dashboard/org.universaal.tools.dashboard/src/org/universaal/tools/dashboard/views/OntologyView.java
+ 47
− 60
View file @ 6a06fa0c
package org.universaal.tools.dashboard.views;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.layout.RowLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.layout.RowLayout;
import org.eclipse.ui.part.ViewPart;
import org.eclipse.wb.swt.ResourceManager;
import org.eclipse.wb.swt.SWTResourceManager;
import org.universaal.tools.dashboard.buttonlisteners.CommandCallingListener;
import org.universaal.tools.dashboard.buttonlisteners.TemporaryListener;
public class OntologyView extends Composite {
......@@ -20,16 +22,12 @@ public class OntologyView extends Composite {
Button btnImportExample;
Button btnTransform;
Button btnCreateClass;
Button btnImportClass;
Button btnBuild;
Button btnTestConformance;
Button btnRun;
Button btnDebug;
Button btnCombine;
Button btnPublishToUStore;
Button btnPublishOpenSource;
Button btnCreateAndEdit;
/**
* Create the composite.
* @param parent
......@@ -38,107 +36,95 @@ public class OntologyView extends Composite {
public OntologyView(Composite parent, int style) {
super(parent, style);
setLayout(new GridLayout(7, false));
Group grpProject = new Group(this, SWT.NONE);
grpProject.setFont(SWTResourceManager.getFont("Lucida Grande", 11, SWT.BOLD));
grpProject.setBackground(SWTResourceManager.getColor(135, 206, 250));
grpProject.setLayout(new FillLayout(SWT.VERTICAL));
grpProject.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false, 1, 2));
grpProject.setText("Project");
btnCreate = new Button(grpProject, SWT.NONE);
btnCreate.setText("Create");
btnImportProject = new Button(grpProject, SWT.NONE);
btnImportProject.setEnabled(false);
btnImportProject.setText("Import Project");
btnImportExample = new Button(grpProject, SWT.NONE);
btnImportExample.setText("Import Example");
Composite composite = new Composite(this, SWT.NONE);
RowLayout rl_composite = new RowLayout(SWT.VERTICAL);
rl_composite.center = true;
composite.setLayout(rl_composite);
composite.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false, 1, 2));
Label lblAbc = new Label(composite, SWT.NONE);
lblAbc.setImage(ResourceManager.getPluginImage("org.universaal.tools.dashboard", "icons/go-next.png"));
btnTransform = new Button(composite, SWT.NONE);
btnTransform.setText("Transform");
Group grpJavaClasses = new Group(this, SWT.NONE);
grpJavaClasses.setFont(SWTResourceManager.getFont("Lucida Grande", 11, SWT.BOLD));
grpJavaClasses.setBackground(SWTResourceManager.getColor(135, 206, 250));
grpJavaClasses.setLayout(new FillLayout(SWT.VERTICAL));
GridData gd_grpJavaClasses = new GridData(SWT.LEFT, SWT.CENTER, false, false, 1, 2);
gd_grpJavaClasses.widthHint = 92;
gd_grpJavaClasses.widthHint = 108;
grpJavaClasses.setLayoutData(gd_grpJavaClasses);
grpJavaClasses.setText("Java Classes");
btnCreateClass = new Button(grpJavaClasses, SWT.NONE);
btnCreateClass.setText("Create");
btnImportClass = new Button(grpJavaClasses, SWT.NONE);
btnImportClass.setEnabled(false);
btnImportClass.setText("Import");
btnCreateClass.setEnabled(false);
btnCreateClass.setText("View and Edit");
Composite composite_1 = new Composite(this, SWT.NONE);
RowLayout rl_composite_1 = new RowLayout(SWT.VERTICAL);
rl_composite_1.center = true;
composite_1.setLayout(rl_composite_1);
composite_1.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false, 1, 2));
Label label = new Label(composite_1, SWT.NONE);
label.setImage(ResourceManager.getPluginImage("org.universaal.tools.dashboard", "icons/go-next.png"));
btnBuild = new Button(composite_1, SWT.NONE);
btnBuild.setText("Build");
Group grpApplicationBinary = new Group(this, SWT.NONE);
grpApplicationBinary.setFont(SWTResourceManager.getFont("Lucida Grande", 11, SWT.BOLD));
grpApplicationBinary.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
grpApplicationBinary.setBackground(SWTResourceManager.getColor(135, 206, 250));
grpApplicationBinary.setText("Application Binary");
grpApplicationBinary.setText("Ontology Binary");
grpApplicationBinary.setLayout(new FillLayout(SWT.VERTICAL));
btnTestConformance = new Button(grpApplicationBinary, SWT.NONE);
btnTestConformance.setEnabled(true);
btnTestConformance.setText("Test Conformance");
btnRun = new Button(grpApplicationBinary, SWT.NONE);
btnRun.setText("Run");
btnDebug = new Button(grpApplicationBinary, SWT.NONE);
btnDebug.setText("Debug");
Composite composite_2 = new Composite(this, SWT.NONE);
RowLayout rl_composite_2 = new RowLayout(SWT.VERTICAL);
rl_composite_2.center = true;
composite_2.setLayout(rl_composite_2);
composite_2.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false, 1, 2));
Label label_1 = new Label(composite_2, SWT.NONE);
label_1.setImage(ResourceManager.getPluginImage("org.universaal.tools.dashboard", "icons/go-next.png"));
btnCombine = new Button(composite_2, SWT.NONE);
btnCombine.setEnabled(false);
btnCombine.setText("Combine");
btnCombine.setText("Package");
Group grpPublishableOntology = new Group(this, SWT.BORDER);
grpPublishableOntology.setFont(SWTResourceManager.getFont("Lucida Grande", 11, SWT.BOLD));
grpPublishableOntology.setBackground(SWTResourceManager.getColor(135, 206, 250));
grpPublishableOntology.setLayout(new FillLayout(SWT.VERTICAL));
grpPublishableOntology.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false, 1, 2));
grpPublishableOntology.setText("Publishable Ontology");
btnPublishToUStore = new Button(grpPublishableOntology, SWT.NONE);
btnPublishToUStore.setText("Publish to uStore");
btnPublishOpenSource = new Button(grpPublishableOntology, SWT.NONE);
btnPublishOpenSource.setText("Publish Open Source");
Group grpApplicationDescription = new Group(this, SWT.NONE);
grpApplicationDescription.setFont(SWTResourceManager.getFont("Lucida Grande", 11, SWT.BOLD));
grpApplicationDescription.setBackground(SWTResourceManager.getColor(135, 206, 250));
......@@ -147,7 +133,7 @@ public class OntologyView extends Composite {
grpApplicationDescription.setLayoutData(gd_grpApplicationDescription);
grpApplicationDescription.setText("Application Description");
grpApplicationDescription.setLayout(new FillLayout(SWT.VERTICAL));
btnCreateAndEdit = new Button(grpApplicationDescription, SWT.NONE);
btnCreateAndEdit.setText("Create and Edit");
......@@ -157,34 +143,35 @@ public class OntologyView extends Composite {
protected void checkSubclass() {
// Disable the check that prevents subclassing of SWT components
}
DashboardView containingPart;
private void addCommandCallingListener(Button btn, String commandID, String featureName) {
btn.addSelectionListener(new CommandCallingListener(containingPart, commandID, featureName));
}
/**
* Use this method to create all the buttonlisteners, and assign them to
* their respective buttons.
*/
protected void createActions(DashboardView containingPart) {
this.containingPart = containingPart;
// btnImportProject.addSelectionListener(new TemporaryListener(this, "Import Project"));
// btnImportProject.addSelectionListener(new TemporaryListener(this, "Import Project"));
//btnImportExample.addSelectionListener(new ImportExampleListener(this));
addCommandCallingListener(btnImportExample,"org.universaal.importexternalproject.commands.importexample", "AAL Studio integration with Developer Depot");
//Java Classes
//btnCreateClass.addSelectionListener(new CreateNewItemListener(this));
addCommandCallingListener(btnCreateClass,"org.universaal.tools.newwizard.plugin.command.startNewItemWizard", "AAL Studio Project Wizards");
// btnImportClass.addSelectionListener(new TemporaryListener(this, "Import Class"));
// btnImportClass.addSelectionListener(new TemporaryListener(this, "Import Class"));
//Application Binary
addCommandCallingListener(btnTestConformance, "org.universaal.tools.conformanceTools.commands.ConformanceToolsRun", "AAL Studio Conformance Tools");
// btnTestConformance.addSelectionListener(new TemporaryListener(this, "Test Conformance"));
//btnRun.addSelectionListener(new RunProjectListener(this));
addCommandCallingListener(btnRun,"org.universaal.tools.buildserviceapplication.actions.RunAction", "AAL Studio Build");
//addCommandCallingListener(btnRun,"org.universaal.tools.buildserviceapplication.actions.RunAction", "AAL Studio Build");
//btnDebug.addSelectionListener(new DebugProjectListener(this));
addCommandCallingListener(btnDebug,"org.universaal.tools.buildserviceapplication.actions.DebugAction", "AAL Studio Build");
//addCommandCallingListener(btnDebug,"org.universaal.tools.buildserviceapplication.actions.DebugAction", "AAL Studio Build");
//Project Description
addCommandCallingListener(btnCreateAndEdit,"org.universaal.tools.uploadopensourceplugin.generateaalapp", "AAL Studio integration with Developer Depot");
......@@ -193,17 +180,17 @@ public class OntologyView extends Composite {
//btnUploadOpenSource.addSelectionListener(new UploadOpenSourceListener(this));
addCommandCallingListener(btnPublishOpenSource,"org.universaal.tools.uploadopensourceplugin.commands.uploadopensource", "AAL Studio integration with Developer Depot");
//btnPublishUstore.addSelectionListener(new PublishProjectListener(this));
addCommandCallingListener(btnPublishToUStore,"org.universaal.tools.buildserviceapplication.actions.PublishAction", "AAL Studio Build");
//addCommandCallingListener(btnPublishToUStore,"org.universaal.tools.buildserviceapplication.actions.PublishAction", "AAL Studio Build");
//Application Design
//btnCreate.addSelectionListener(new CreateOntologyProjectListener(this));
addCommandCallingListener(btnCreate,"org.universaal.tools.modelling.ontology.wizard.commands.newOntologyProject", "AAL Studio Modelling Support");
// Transitions
addCommandCallingListener(btnBuild,"org.universaal.tools.buildserviceapplication.actions.BuildAction", "AAL Studio Build");
addCommandCallingListener(btnTransform,"org.universaal.tools.transformationcommand.commands.ontUML2Java", "AAL Studio Transformations");
//
//lblBuild.addMouseListener(new BuildProjectListener(this));
//lblCombine.addMouseListener(new TemporaryMouseListener(this, "Combine Project"));
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment