From 2c13eb81e92708a9db46efd3b8a43bc63e54ae65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Horv=C3=A1th=20D=C3=A1vid?= Date: Fri, 4 Jun 2021 16:06:12 +0200 Subject: [PATCH] adding warning dialog for empty project and fixing minor display issues --- .../ifl/ide/accessor/source/CodeEntityAccessor.java | 3 +++ .../src/org/eclipse/sed/ifl/ide/gui/FilterPart.java | 6 +++--- .../sed/ifl/ide/gui/element/CodeElementUI.java | 4 +++- .../sed/ifl/ide/gui/element/RuleElementUI.java | 12 +++++++++++- .../ifl/ide/gui/rulecreator/IntegerRuleCreator.java | 2 +- .../features/org.eclipse.sed.ifl.feature/feature.xml | 2 +- .../releng/org.eclipse.sed.ifl.update/category.xml | 2 +- 7 files changed, 23 insertions(+), 8 deletions(-) diff --git a/org.eclipse.sed.ifl.root/bundles/org.eclipse.sed.ifl/src/org/eclipse/sed/ifl/ide/accessor/source/CodeEntityAccessor.java b/org.eclipse.sed.ifl.root/bundles/org.eclipse.sed.ifl/src/org/eclipse/sed/ifl/ide/accessor/source/CodeEntityAccessor.java index 87635e23..8bbc64aa 100644 --- a/org.eclipse.sed.ifl.root/bundles/org.eclipse.sed.ifl/src/org/eclipse/sed/ifl/ide/accessor/source/CodeEntityAccessor.java +++ b/org.eclipse.sed.ifl.root/bundles/org.eclipse.sed.ifl/src/org/eclipse/sed/ifl/ide/accessor/source/CodeEntityAccessor.java @@ -108,6 +108,9 @@ public IJavaProject getSelectedProject() { throw new WrongSelectionException("Non-resources selected."); } IProject project = resource.getProject(); + if (!project.isOpen()) { + throw new WrongSelectionException("The selected project is closed. Please open the project before starting an iFL session."); + } if (EU.tryUnchecked(() -> project.isNatureEnabled(Natures.JAVA.getValue()))) { return JavaCore.create(project); } diff --git a/org.eclipse.sed.ifl.root/bundles/org.eclipse.sed.ifl/src/org/eclipse/sed/ifl/ide/gui/FilterPart.java b/org.eclipse.sed.ifl.root/bundles/org.eclipse.sed.ifl/src/org/eclipse/sed/ifl/ide/gui/FilterPart.java index 2895f845..48d56cab 100644 --- a/org.eclipse.sed.ifl.root/bundles/org.eclipse.sed.ifl/src/org/eclipse/sed/ifl/ide/gui/FilterPart.java +++ b/org.eclipse.sed.ifl.root/bundles/org.eclipse.sed.ifl/src/org/eclipse/sed/ifl/ide/gui/FilterPart.java @@ -137,7 +137,7 @@ public void widgetDefaultSelected(SelectionEvent e) { scrolledComposite = new ScrolledComposite(parent, SWT.V_SCROLL); GridData gd_scrolledComposite = new GridData(SWT.CENTER, SWT.CENTER, false, false, 3, 1); - gd_scrolledComposite.widthHint = 360; + gd_scrolledComposite.widthHint = 320; gd_scrolledComposite.heightHint = 280; scrolledComposite.setLayoutData(gd_scrolledComposite); scrolledComposite.setExpandHorizontal(true); @@ -145,10 +145,10 @@ public void widgetDefaultSelected(SelectionEvent e) { rulesComposite = new Composite(scrolledComposite, SWT.NONE); rulesComposite.setBackground(SWTResourceManager.getColor(SWT.COLOR_WHITE)); - rulesComposite.setSize(new Point(360, 280)); + rulesComposite.setSize(new Point(320, 280)); rulesComposite.setLayout(new GridLayout(1, false)); scrolledComposite.setContent(rulesComposite); - scrolledComposite.setMinSize(rulesComposite.getSize()); + scrolledComposite.setMinSize(new Point(320, 280)); System.out.println(rules.size()); diff --git a/org.eclipse.sed.ifl.root/bundles/org.eclipse.sed.ifl/src/org/eclipse/sed/ifl/ide/gui/element/CodeElementUI.java b/org.eclipse.sed.ifl.root/bundles/org.eclipse.sed.ifl/src/org/eclipse/sed/ifl/ide/gui/element/CodeElementUI.java index 87cbd868..93a26b63 100644 --- a/org.eclipse.sed.ifl.root/bundles/org.eclipse.sed.ifl/src/org/eclipse/sed/ifl/ide/gui/element/CodeElementUI.java +++ b/org.eclipse.sed.ifl.root/bundles/org.eclipse.sed.ifl/src/org/eclipse/sed/ifl/ide/gui/element/CodeElementUI.java @@ -178,7 +178,9 @@ public CodeElementUI(Composite parent, int style, nameKeyLabel.setText("Name:"); nameValueLabel = new Text(this, SWT.READ_ONLY); - nameValueLabel.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false, 2, 1)); + GridData gd_nameValueLabel = new GridData(SWT.LEFT, SWT.CENTER, false, false, 2, 1); + gd_nameValueLabel.widthHint = 140; + nameValueLabel.setLayoutData(gd_nameValueLabel); nameValueLabel.setText(name); signatureIcon = new Label(this, SWT.NONE); diff --git a/org.eclipse.sed.ifl.root/bundles/org.eclipse.sed.ifl/src/org/eclipse/sed/ifl/ide/gui/element/RuleElementUI.java b/org.eclipse.sed.ifl.root/bundles/org.eclipse.sed.ifl/src/org/eclipse/sed/ifl/ide/gui/element/RuleElementUI.java index cc587caf..8d7fb2e3 100644 --- a/org.eclipse.sed.ifl.root/bundles/org.eclipse.sed.ifl/src/org/eclipse/sed/ifl/ide/gui/element/RuleElementUI.java +++ b/org.eclipse.sed.ifl.root/bundles/org.eclipse.sed.ifl/src/org/eclipse/sed/ifl/ide/gui/element/RuleElementUI.java @@ -1,5 +1,10 @@ package org.eclipse.sed.ifl.ide.gui.element; +import java.math.RoundingMode; +import java.text.DecimalFormat; +import java.text.DecimalFormatSymbols; +import java.util.Locale; + import org.eclipse.sed.ifl.control.score.filter.BooleanRule; import org.eclipse.sed.ifl.control.score.filter.DoubleRule; import org.eclipse.sed.ifl.control.score.filter.LastActionRule; @@ -26,6 +31,9 @@ public class RuleElementUI extends Composite { + private static final DecimalFormatSymbols symbols = new DecimalFormatSymbols(Locale.US); + private static final DecimalFormat LIMIT_FORMAT = new DecimalFormat("#0.0000", symbols); + private Rule rule; public Rule getRule() { @@ -92,6 +100,7 @@ public void widgetDefaultSelected(SelectionEvent e) { resultsValueLabel = new Label(this, SWT.NONE); resultsValueLabel.setText("-"); + new Label(this, SWT.NONE); addDisposeListener(new DisposeListener() { @@ -117,7 +126,8 @@ private String setRuleValueLabelText() { negatedString = "not "; } switch(this.rule.getDomain()) { - case "Score": rString = ((DoubleRule)this.rule).getRelation().concat(" ").concat(Double.toString(((DoubleRule)this.rule).getValue())); + case "Score": LIMIT_FORMAT.setRoundingMode(RoundingMode.DOWN); + rString = ((DoubleRule)this.rule).getRelation().concat(" ").concat(LIMIT_FORMAT.format(((DoubleRule)this.rule).getValue())); icon = ResourceManager.getPluginImage("org.eclipse.sed.ifl", "icons/rule_score_3.png"); break; case "Name": diff --git a/org.eclipse.sed.ifl.root/bundles/org.eclipse.sed.ifl/src/org/eclipse/sed/ifl/ide/gui/rulecreator/IntegerRuleCreator.java b/org.eclipse.sed.ifl.root/bundles/org.eclipse.sed.ifl/src/org/eclipse/sed/ifl/ide/gui/rulecreator/IntegerRuleCreator.java index 9f57b992..b694810f 100644 --- a/org.eclipse.sed.ifl.root/bundles/org.eclipse.sed.ifl/src/org/eclipse/sed/ifl/ide/gui/rulecreator/IntegerRuleCreator.java +++ b/org.eclipse.sed.ifl.root/bundles/org.eclipse.sed.ifl/src/org/eclipse/sed/ifl/ide/gui/rulecreator/IntegerRuleCreator.java @@ -31,7 +31,7 @@ public IntegerRuleCreator(Composite parent, String domain) { enterValueLabel.setText("Enter value:"); spinner = new Spinner(composite, SWT.BORDER); - spinner.setMaximum(10000); + spinner.setMaximum(Integer.MAX_VALUE); Label addRelationLabel = new Label(composite, SWT.NONE); addRelationLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1)); diff --git a/org.eclipse.sed.ifl.root/features/org.eclipse.sed.ifl.feature/feature.xml b/org.eclipse.sed.ifl.root/features/org.eclipse.sed.ifl.feature/feature.xml index 55056dae..57b450dc 100644 --- a/org.eclipse.sed.ifl.root/features/org.eclipse.sed.ifl.feature/feature.xml +++ b/org.eclipse.sed.ifl.root/features/org.eclipse.sed.ifl.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.sed.ifl.root/releng/org.eclipse.sed.ifl.update/category.xml b/org.eclipse.sed.ifl.root/releng/org.eclipse.sed.ifl.update/category.xml index 5189a11c..2aa4b82d 100644 --- a/org.eclipse.sed.ifl.root/releng/org.eclipse.sed.ifl.update/category.xml +++ b/org.eclipse.sed.ifl.root/releng/org.eclipse.sed.ifl.update/category.xml @@ -1,6 +1,6 @@ - +