better string comparison

wocommunity · Dec 12, 2012 · 4f493e3 · 4f493e3
1 parent 020de63
commit 4f493e3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/...s/Core/ERExtensions/Sources/er/extensions/appserver/navigation/ERXNavigationMenuItem.java b/...s/Core/ERExtensions/Sources/er/extensions/appserver/navigation/ERXNavigationMenuItem.java
@@ -132,11 +132,11 @@ public String contextComponentActionURL() {
     public WOComponent menuItemSelected() {
         WOComponent anActionResult = null;
 
-        if ((navigationItem().action() != null) && (navigationItem().action() != "")) {
+        if (!ERXStringUtilities.stringIsNullOrEmpty(navigationItem().action())) {
             anActionResult = (WOComponent)valueForKeyPath(navigationItem().action());
-        } else if ((navigationItem().pageName() != null) && (navigationItem().pageName() != "")) {
+        } else if (!ERXStringUtilities.stringIsNullOrEmpty(navigationItem().pageName())) {
             anActionResult = pageWithName(navigationItem().pageName());
-        } else if ((navigationItem().directActionName() != null) && (navigationItem().directActionName() != "")) {
+        } else if (!ERXStringUtilities.stringIsNullOrEmpty(navigationItem().directActionName())) {
             // FIXME: Need to support directAction classes
             if(_linkDirectlyToDirectActions) {
                 ERXDirectAction da = new ERXDirectAction(context().request());

diff --git a/Frameworks/Misc/ERPDFGeneration/Sources/er/pdf/builder/FOPBuilderFactory.java b/Frameworks/Misc/ERPDFGeneration/Sources/er/pdf/builder/FOPBuilderFactory.java
@@ -15,11 +15,11 @@ public static FOPBuilder newBuilder() {
 	}
 
 	public static FOPBuilder newBuilder(String outputType) throws Exception {
-		if (outputType == null || outputType == MimeConstants.MIME_PDF) {
+		if (MimeConstants.MIME_PDF.equals(outputType)) {
 			return new Fop2PdfImpl();
 		}
 
-		if ( outputType == MimeConstants.MIME_EPS) {
+		if (MimeConstants.MIME_EPS.equals(outputType)) {
 			return new Fop2EpsImpl();
 		}