Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjphillips2011-06-13 18:14:40 +0000
committerRyan D. Brooks2011-06-13 18:14:40 +0000
commit6e67ac7427a181f471b9bb24e65b5030c8c3fd0d (patch)
treee2f0a67e498f6caee5e38091ddd7c0af78973f4e
parent44a81e7b12f06350601c4f86d41a43e34c0cc458 (diff)
downloadorg.eclipse.osee-6e67ac7427a181f471b9bb24e65b5030c8c3fd0d.tar.gz
org.eclipse.osee-6e67ac7427a181f471b9bb24e65b5030c8c3fd0d.tar.xz
org.eclipse.osee-6e67ac7427a181f471b9bb24e65b5030c8c3fd0d.zip
bug[ats_A777U]: Fix issue where XStackedDam widget was saving invalid changes for WTC attribute
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XCheckBoxDam.java12
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboBooleanDam.java20
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboDam.java20
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XDateDam.java28
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XFloatDam.java24
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelMemberSelDam.java24
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XIntegerDam.java24
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XListDam.java16
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XSelectFromMultiChoiceDam.java16
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XStackedDam.java16
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextDam.java10
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextFlatDam.java16
12 files changed, 125 insertions, 101 deletions
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XCheckBoxDam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XCheckBoxDam.java
index 4103253aa62..42e0bb0a4fe 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XCheckBoxDam.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XCheckBoxDam.java
@@ -49,11 +49,13 @@ public class XCheckBoxDam extends XCheckBox implements IAttributeWidget {
@Override
public Result isDirty() throws OseeCoreException {
- if (checkButton != null && !checkButton.isDisposed()) {
- Boolean enteredValue = checkButton.getSelection();
- Boolean storedValue = artifact.getSoleAttributeValue(attributeType, false);
- if (enteredValue.booleanValue() != storedValue.booleanValue()) {
- return new Result(true, attributeType + " is dirty");
+ if (isEditable()) {
+ if (checkButton != null && !checkButton.isDisposed()) {
+ Boolean enteredValue = checkButton.getSelection();
+ Boolean storedValue = artifact.getSoleAttributeValue(attributeType, false);
+ if (enteredValue.booleanValue() != storedValue.booleanValue()) {
+ return new Result(true, attributeType + " is dirty");
+ }
}
}
return Result.FalseResult;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboBooleanDam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboBooleanDam.java
index 6313eecd188..23417810aca 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboBooleanDam.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboBooleanDam.java
@@ -70,15 +70,17 @@ public class XComboBooleanDam extends XCombo implements IAttributeWidget {
@Override
public Result isDirty() throws OseeCoreException {
- try {
- String enteredValue = get();
- boolean storedValue = artifact.getSoleAttributeValue(attributeType);
- if (enteredValue.equals("yes") != storedValue) {
- return new Result(true, attributeType + " is dirty");
- }
- } catch (AttributeDoesNotExist ex) {
- if (!get().equals("")) {
- return new Result(true, attributeType + " is dirty");
+ if (isEditable()) {
+ try {
+ String enteredValue = get();
+ boolean storedValue = artifact.getSoleAttributeValue(attributeType);
+ if (enteredValue.equals("yes") != storedValue) {
+ return new Result(true, attributeType + " is dirty");
+ }
+ } catch (AttributeDoesNotExist ex) {
+ if (!get().equals("")) {
+ return new Result(true, attributeType + " is dirty");
+ }
}
}
return Result.FalseResult;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboDam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboDam.java
index b22fe8f6173..427690aefa9 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboDam.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboDam.java
@@ -70,15 +70,17 @@ public class XComboDam extends XCombo implements IAttributeWidget {
@Override
public Result isDirty() throws OseeCoreException {
- try {
- String enteredValue = get();
- String storedValue = artifact.getSoleAttributeValue(attributeType);
- if (!enteredValue.equals(storedValue)) {
- return new Result(true, attributeType + " is dirty");
- }
- } catch (AttributeDoesNotExist ex) {
- if (!get().equals("")) {
- return new Result(true, attributeType + " is dirty");
+ if (isEditable()) {
+ try {
+ String enteredValue = get();
+ String storedValue = artifact.getSoleAttributeValue(attributeType);
+ if (!enteredValue.equals(storedValue)) {
+ return new Result(true, attributeType + " is dirty");
+ }
+ } catch (AttributeDoesNotExist ex) {
+ if (!get().equals("")) {
+ return new Result(true, attributeType + " is dirty");
+ }
}
}
return Result.FalseResult;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XDateDam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XDateDam.java
index 3e9408644fb..1a33d20c64d 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XDateDam.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XDateDam.java
@@ -67,19 +67,21 @@ public class XDateDam extends XDate implements IAttributeWidget {
@Override
public Result isDirty() throws OseeCoreException {
- Date enteredValue = getDate();
- Date storedValue = getArtifact().getSoleAttributeValue(getAttributeType(), null);
- if (enteredValue == null && storedValue == null) {
- return Result.FalseResult;
- }
- if (enteredValue == null && storedValue != null) {
- return new Result(true, getAttributeType() + " is dirty");
- }
- if (enteredValue != null && storedValue == null) {
- return new Result(true, getAttributeType() + " is dirty");
- }
- if (enteredValue.getTime() != storedValue.getTime()) {
- return new Result(true, getAttributeType() + " is dirty");
+ if (isEditable()) {
+ Date enteredValue = getDate();
+ Date storedValue = getArtifact().getSoleAttributeValue(getAttributeType(), null);
+ if (enteredValue == null && storedValue == null) {
+ return Result.FalseResult;
+ }
+ if (enteredValue == null && storedValue != null) {
+ return new Result(true, getAttributeType() + " is dirty");
+ }
+ if (enteredValue != null && storedValue == null) {
+ return new Result(true, getAttributeType() + " is dirty");
+ }
+ if (enteredValue.getTime() != storedValue.getTime()) {
+ return new Result(true, getAttributeType() + " is dirty");
+ }
}
return Result.FalseResult;
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XFloatDam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XFloatDam.java
index 1e5b786df50..d927ef4346d 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XFloatDam.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XFloatDam.java
@@ -69,18 +69,20 @@ public class XFloatDam extends XFloat implements IAttributeWidget {
@Override
public Result isDirty() throws OseeCoreException {
- try {
- Double enteredValue = getFloat();
- Double storedValue = getArtifact().getSoleAttributeValue(getAttributeType());
- if (enteredValue.doubleValue() != storedValue.doubleValue()) {
- return new Result(true, getAttributeType() + " is dirty");
- }
- } catch (AttributeDoesNotExist ex) {
- if (!get().equals("")) {
- return new Result(true, getAttributeType() + " is dirty");
+ if (isEditable()) {
+ try {
+ Double enteredValue = getFloat();
+ Double storedValue = getArtifact().getSoleAttributeValue(getAttributeType());
+ if (enteredValue.doubleValue() != storedValue.doubleValue()) {
+ return new Result(true, getAttributeType() + " is dirty");
+ }
+ } catch (AttributeDoesNotExist ex) {
+ if (!get().equals("")) {
+ return new Result(true, getAttributeType() + " is dirty");
+ }
+ } catch (NumberFormatException ex) {
+ // do nothing
}
- } catch (NumberFormatException ex) {
- // do nothing
}
return Result.FalseResult;
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelMemberSelDam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelMemberSelDam.java
index b0b118753c2..ec75f3c9a8e 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelMemberSelDam.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelMemberSelDam.java
@@ -96,18 +96,20 @@ public class XHyperlabelMemberSelDam extends XHyperlabelMemberSelection implemen
@Override
public Result isDirty() throws OseeCoreException {
- try {
- String enteredValue = getSelectedStringValue();
- String storedValue = artifact.getSoleAttributeValue(attributeType);
- if (!enteredValue.equals(storedValue)) {
- return new Result(true, attributeType + " is dirty");
- }
- } catch (AttributeDoesNotExist ex) {
- if (!artifact.getSoleAttributeValue(attributeType, "").equals("")) {
- return new Result(true, attributeType + " is dirty");
+ if (isEditable()) {
+ try {
+ String enteredValue = getSelectedStringValue();
+ String storedValue = artifact.getSoleAttributeValue(attributeType);
+ if (!enteredValue.equals(storedValue)) {
+ return new Result(true, attributeType + " is dirty");
+ }
+ } catch (AttributeDoesNotExist ex) {
+ if (!artifact.getSoleAttributeValue(attributeType, "").equals("")) {
+ return new Result(true, attributeType + " is dirty");
+ }
+ } catch (NumberFormatException ex) {
+ // do nothing
}
- } catch (NumberFormatException ex) {
- // do nothing
}
return Result.FalseResult;
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XIntegerDam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XIntegerDam.java
index 6d3f89ea8ed..fc216661d97 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XIntegerDam.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XIntegerDam.java
@@ -69,18 +69,20 @@ public class XIntegerDam extends XInteger implements IAttributeWidget {
@Override
public Result isDirty() throws OseeCoreException {
- try {
- Integer enteredValue = getInteger();
- Integer storedValue = getArtifact().getSoleAttributeValue(getAttributeType());
- if (enteredValue.doubleValue() != storedValue.doubleValue()) {
- return new Result(true, getAttributeType() + " is dirty");
- }
- } catch (AttributeDoesNotExist ex) {
- if (!get().equals("")) {
- return new Result(true, getAttributeType() + " is dirty");
+ if (isEditable()) {
+ try {
+ Integer enteredValue = getInteger();
+ Integer storedValue = getArtifact().getSoleAttributeValue(getAttributeType());
+ if (enteredValue.doubleValue() != storedValue.doubleValue()) {
+ return new Result(true, getAttributeType() + " is dirty");
+ }
+ } catch (AttributeDoesNotExist ex) {
+ if (!get().equals("")) {
+ return new Result(true, getAttributeType() + " is dirty");
+ }
+ } catch (NumberFormatException ex) {
+ // do nothing
}
- } catch (NumberFormatException ex) {
- // do nothing
}
return Result.FalseResult;
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XListDam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XListDam.java
index 481a65200b5..9ff2d43806d 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XListDam.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XListDam.java
@@ -57,14 +57,16 @@ public class XListDam extends XList implements IAttributeWidget {
@Override
public Result isDirty() throws OseeCoreException {
- try {
- Collection<String> enteredValues = getSelectedStrs();
- Collection<String> storedValues = getStoredStrs();
- if (!Collections.isEqual(enteredValues, storedValues)) {
- return new Result(true, getAttributeType() + " is dirty");
+ if (isEditable()) {
+ try {
+ Collection<String> enteredValues = getSelectedStrs();
+ Collection<String> storedValues = getStoredStrs();
+ if (!Collections.isEqual(enteredValues, storedValues)) {
+ return new Result(true, getAttributeType() + " is dirty");
+ }
+ } catch (NumberFormatException ex) {
+ // do nothing
}
- } catch (NumberFormatException ex) {
- // do nothing
}
return Result.FalseResult;
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XSelectFromMultiChoiceDam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XSelectFromMultiChoiceDam.java
index d94ffeebf92..30c66919c75 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XSelectFromMultiChoiceDam.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XSelectFromMultiChoiceDam.java
@@ -76,14 +76,16 @@ public class XSelectFromMultiChoiceDam extends XSelectFromDialog<String> impleme
@Override
public Result isDirty() throws OseeCoreException {
- try {
- Collection<String> enteredValues = getSelected();
- Collection<String> storedValues = getStored();
- if (!Collections.isEqual(enteredValues, storedValues)) {
- return new Result(true, getAttributeType() + " is dirty");
+ if (isEditable()) {
+ try {
+ Collection<String> enteredValues = getSelected();
+ Collection<String> storedValues = getStored();
+ if (!Collections.isEqual(enteredValues, storedValues)) {
+ return new Result(true, getAttributeType() + " is dirty");
+ }
+ } catch (NumberFormatException ex) {
+ // do nothing
}
- } catch (NumberFormatException ex) {
- // do nothing
}
return Result.FalseResult;
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XStackedDam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XStackedDam.java
index 383630ac956..1d1dadd40db 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XStackedDam.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XStackedDam.java
@@ -139,14 +139,16 @@ public class XStackedDam extends XStackedWidget<String> implements IAttributeWid
@Override
public Result isDirty() throws OseeCoreException {
- try {
- Collection<String> enteredValues = getInput();
- Collection<String> storedValues = getStored();
- if (!Collections.isEqual(enteredValues, storedValues)) {
- return new Result(true, getAttributeType() + " is dirty");
+ if (isEditable()) {
+ try {
+ Collection<String> enteredValues = getInput();
+ Collection<String> storedValues = getStored();
+ if (!Collections.isEqual(enteredValues, storedValues)) {
+ return new Result(true, getAttributeType() + " is dirty");
+ }
+ } catch (NumberFormatException ex) {
+ // do nothing
}
- } catch (NumberFormatException ex) {
- // do nothing
}
return Result.FalseResult;
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextDam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextDam.java
index 533cfa6c4b3..64dff638355 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextDam.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextDam.java
@@ -89,10 +89,12 @@ public class XTextDam extends XText implements IAttributeWidget {
@Override
public Result isDirty() throws OseeCoreException {
- String enteredValue = get();
- String storedValue = getArtifact().getSoleAttributeValue(getAttributeType(), "");
- if (!enteredValue.equals(storedValue)) {
- return new Result(true, attributeType + " is dirty");
+ if (isEditable()) {
+ String enteredValue = get();
+ String storedValue = getArtifact().getSoleAttributeValue(getAttributeType(), "");
+ if (!enteredValue.equals(storedValue)) {
+ return new Result(true, attributeType + " is dirty");
+ }
}
return Result.FalseResult;
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextFlatDam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextFlatDam.java
index 0cfdd707120..c2e8d20c4d4 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextFlatDam.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextFlatDam.java
@@ -151,14 +151,16 @@ public class XTextFlatDam extends XFlatWidget<String> implements IAttributeWidge
@Override
public Result isDirty() throws OseeCoreException {
- try {
- Collection<String> enteredValues = new ArrayList<String>();//getSelected();
- Collection<String> storedValues = getStored();
- if (!Collections.isEqual(enteredValues, storedValues)) {
- return new Result(true, getAttributeType() + " is dirty");
+ if (isEditable()) {
+ try {
+ Collection<String> enteredValues = new ArrayList<String>();//getSelected();
+ Collection<String> storedValues = getStored();
+ if (!Collections.isEqual(enteredValues, storedValues)) {
+ return new Result(true, getAttributeType() + " is dirty");
+ }
+ } catch (NumberFormatException ex) {
+ // do nothing
}
- } catch (NumberFormatException ex) {
- // do nothing
}
return Result.FalseResult;
}

Back to the top