summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Drossel2009-01-08 11:13:33 (EST)
committerCarsten Drossel2009-01-08 11:13:33 (EST)
commitff6fc8b93d9adc33c4fc42e9489b943c70b7c137 (patch)
tree6e76466ac883fa2615aee5512a229bde472d97b1
parent2710df18dc6b35bc4bdf4a68ab9c073e30635041 (diff)
downloadorg.eclipse.riena-ff6fc8b93d9adc33c4fc42e9489b943c70b7c137.zip
org.eclipse.riena-ff6fc8b93d9adc33c4fc42e9489b943c70b7c137.tar.gz
org.eclipse.riena-ff6fc8b93d9adc33c4fc42e9489b943c70b7c137.tar.bz2
fixed findbugs warnings
-rw-r--r--org.eclipse.riena.ui.swt/src/org/eclipse/riena/ui/swt/EmbeddedTitleBar.java6
-rw-r--r--org.eclipse.riena.ui.swt/src/org/eclipse/riena/ui/swt/RienaDialogDelegate.java2
-rw-r--r--org.eclipse.riena.ui.swt/src/org/eclipse/riena/ui/swt/uiprocess/ProgressInfoDataObject.java2
3 files changed, 3 insertions, 7 deletions
diff --git a/org.eclipse.riena.ui.swt/src/org/eclipse/riena/ui/swt/EmbeddedTitleBar.java b/org.eclipse.riena.ui.swt/src/org/eclipse/riena/ui/swt/EmbeddedTitleBar.java
index c291d87..681eb66 100644
--- a/org.eclipse.riena.ui.swt/src/org/eclipse/riena/ui/swt/EmbeddedTitleBar.java
+++ b/org.eclipse.riena.ui.swt/src/org/eclipse/riena/ui/swt/EmbeddedTitleBar.java
@@ -302,11 +302,7 @@ public class EmbeddedTitleBar extends Canvas {
* @return true, if value has changed; otherwise false
*/
private boolean hasChanged(Object oldValue, Object newValue) {
- if (oldValue == null && newValue == null) {
- return false;
- }
- return (oldValue == null && newValue != null) || (oldValue != null && newValue == null)
- || !oldValue.equals(newValue);
+ return (oldValue == null && newValue != null) || (oldValue != null && !oldValue.equals(newValue));
}
public void setCloseButtonPressed(boolean closeButtonPressed) {
diff --git a/org.eclipse.riena.ui.swt/src/org/eclipse/riena/ui/swt/RienaDialogDelegate.java b/org.eclipse.riena.ui.swt/src/org/eclipse/riena/ui/swt/RienaDialogDelegate.java
index ad68f5e..bef08e3 100644
--- a/org.eclipse.riena.ui.swt/src/org/eclipse/riena/ui/swt/RienaDialogDelegate.java
+++ b/org.eclipse.riena.ui.swt/src/org/eclipse/riena/ui/swt/RienaDialogDelegate.java
@@ -245,7 +245,7 @@ public class RienaDialogDelegate {
}
}
- private class DialogTitleBarMouseListener extends AbstractTitleBarMouseListener {
+ private static class DialogTitleBarMouseListener extends AbstractTitleBarMouseListener {
@Override
protected AbstractTitleBarRenderer getTitleBarRenderer() {
diff --git a/org.eclipse.riena.ui.swt/src/org/eclipse/riena/ui/swt/uiprocess/ProgressInfoDataObject.java b/org.eclipse.riena.ui.swt/src/org/eclipse/riena/ui/swt/uiprocess/ProgressInfoDataObject.java
index 9f264ad..50c374b 100644
--- a/org.eclipse.riena.ui.swt/src/org/eclipse/riena/ui/swt/uiprocess/ProgressInfoDataObject.java
+++ b/org.eclipse.riena.ui.swt/src/org/eclipse/riena/ui/swt/uiprocess/ProgressInfoDataObject.java
@@ -68,7 +68,7 @@ public class ProgressInfoDataObject implements Comparable<ProgressInfoDataObject
@Override
public boolean equals(Object obj) {
- if (!ProgressInfoDataObject.class.isAssignableFrom(obj.getClass())) {
+ if (obj == null || !ProgressInfoDataObject.class.isAssignableFrom(obj.getClass())) {
return false;
}
ProgressInfoDataObject other = ProgressInfoDataObject.class.cast(obj);