ofbiz-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jler...@apache.org
Subject svn commit: r1418875 [2/2] - in /ofbiz/branches/webhelp-2012-12-07: ./ applications/accounting/src/org/ofbiz/accounting/payment/ applications/accounting/src/org/ofbiz/accounting/tax/ applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/ a...
Date Sun, 09 Dec 2012 10:07:00 GMT
Modified: ofbiz/branches/webhelp-2012-12-07/framework/entity/src/org/ofbiz/entity/util/EntityCrypto.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/entity/src/org/ofbiz/entity/util/EntityCrypto.java?rev=1418875&r1=1418874&r2=1418875&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/framework/entity/src/org/ofbiz/entity/util/EntityCrypto.java
(original)
+++ ofbiz/branches/webhelp-2012-12-07/framework/entity/src/org/ofbiz/entity/util/EntityCrypto.java
Sun Dec  9 10:06:52 2012
@@ -20,18 +20,14 @@ package org.ofbiz.entity.util;
 
 import java.io.IOException;
 import java.security.NoSuchAlgorithmException;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Random;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
 import javax.crypto.SecretKey;
-import javax.transaction.Transaction;
 
 import org.apache.commons.codec.binary.Base64;
-
 import org.ofbiz.base.crypto.DesCrypt;
 import org.ofbiz.base.crypto.HashCrypt;
 import org.ofbiz.base.util.Debug;
@@ -39,11 +35,10 @@ import org.ofbiz.base.util.GeneralExcept
 import org.ofbiz.base.util.StringUtil;
 import org.ofbiz.base.util.UtilObject;
 import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.entity.EntityCryptoException;
 import org.ofbiz.entity.Delegator;
+import org.ofbiz.entity.EntityCryptoException;
 import org.ofbiz.entity.GenericEntityException;
 import org.ofbiz.entity.GenericValue;
-import org.ofbiz.entity.transaction.GenericTransactionException;
 import org.ofbiz.entity.transaction.TransactionUtil;
 
 public final class EntityCrypto {
@@ -221,38 +216,46 @@ public final class EntityCrypto {
     }
 
     protected static abstract class LegacyStorageHandler extends StorageHandler {
+        @Override
         protected byte[] decodeKeyBytes(String keyText) throws GeneralException {
             return StringUtil.fromHexString(keyText);
         }
 
+        @Override
         protected String encodeKey(SecretKey key) {
             return StringUtil.toHexString(key.getEncoded());
         }
 
+        @Override
         protected byte[] decryptValue(SecretKey key, String encryptedString) throws GeneralException
{
             return DesCrypt.decrypt(key, StringUtil.fromHexString(encryptedString));
         }
 
+        @Override
         protected String encryptValue(SecretKey key, byte[] objBytes) throws GeneralException
{
             return StringUtil.toHexString(DesCrypt.encrypt(key, objBytes));
         }
     };
 
     protected static final StorageHandler OldFunnyHashStorageHandler = new LegacyStorageHandler()
{
+        @Override
         protected String getHashedKeyName(String originalKeyName) {
             return HashCrypt.digestHashOldFunnyHex(null, originalKeyName);
         }
 
+        @Override
         protected String getKeyMapPrefix(String hashedKeyName) {
             return "{funny-hash}";
         }
     };
 
     protected static final StorageHandler NormalHashStorageHandler = new LegacyStorageHandler()
{
+        @Override
         protected String getHashedKeyName(String originalKeyName) {
             return HashCrypt.digestHash("SHA", originalKeyName.getBytes());
         }
 
+        @Override
         protected String getKeyMapPrefix(String hashedKeyName) {
             return "{normal-hash}";
         }
@@ -265,14 +268,17 @@ public final class EntityCrypto {
             this.kek = kek;
         }
 
+        @Override
         protected String getHashedKeyName(String originalKeyName) {
             return HashCrypt.digestHash64("SHA", originalKeyName.getBytes());
         }
 
+        @Override
         protected String getKeyMapPrefix(String hashedKeyName) {
             return "{salted-base64}";
         }
 
+        @Override
         protected byte[] decodeKeyBytes(String keyText) throws GeneralException {
             byte[] keyBytes = Base64.decodeBase64(keyText);
             if (kek != null) {
@@ -281,6 +287,7 @@ public final class EntityCrypto {
             return keyBytes;
         }
 
+        @Override
         protected String encodeKey(SecretKey key) throws GeneralException {
             byte[] keyBytes = key.getEncoded();
             if (kek != null) {
@@ -289,6 +296,7 @@ public final class EntityCrypto {
             return Base64.encodeBase64String(keyBytes);
         }
 
+        @Override
         protected byte[] decryptValue(SecretKey key, String encryptedString) throws GeneralException
{
             byte[] allBytes = DesCrypt.decrypt(key, Base64.decodeBase64(encryptedString));
             int length = allBytes[0];
@@ -297,6 +305,7 @@ public final class EntityCrypto {
             return objBytes;
         }
 
+        @Override
         protected String encryptValue(SecretKey key, byte[] objBytes) throws GeneralException
{
             Random random = new Random();
             // random length 5-16

Modified: ofbiz/branches/webhelp-2012-12-07/framework/minilang/src/org/ofbiz/minilang/method/MethodOperation.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/minilang/src/org/ofbiz/minilang/method/MethodOperation.java?rev=1418875&r1=1418874&r2=1418875&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/framework/minilang/src/org/ofbiz/minilang/method/MethodOperation.java
(original)
+++ ofbiz/branches/webhelp-2012-12-07/framework/minilang/src/org/ofbiz/minilang/method/MethodOperation.java
Sun Dec  9 10:06:52 2012
@@ -50,6 +50,7 @@ public abstract class MethodOperation ex
     /** Create a string representation of the operation, using the current context.
      * @deprecated No replacement.
      */
+    @Deprecated
     public String expandedString(MethodContext methodContext) {
         return FlexibleStringExpander.expandString(toString(), methodContext.getEnvMap());
     }
@@ -57,6 +58,7 @@ public abstract class MethodOperation ex
     /** Create a string representation of the operation - similar to the original XML.
      * @deprecated Use {@link #toString()}.
      */
+    @Deprecated
     public String rawString() {
         return toString();
     }

Modified: ofbiz/branches/webhelp-2012-12-07/framework/service/src/org/ofbiz/service/engine/BeanShellEngine.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/service/src/org/ofbiz/service/engine/BeanShellEngine.java?rev=1418875&r1=1418874&r2=1418875&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/framework/service/src/org/ofbiz/service/engine/BeanShellEngine.java
(original)
+++ ofbiz/branches/webhelp-2012-12-07/framework/service/src/org/ofbiz/service/engine/BeanShellEngine.java
Sun Dec  9 10:06:52 2012
@@ -18,14 +18,14 @@
  *******************************************************************************/
 package org.ofbiz.service.engine;
 
+import static org.ofbiz.base.util.UtilGenerics.cast;
+
 import java.util.Map;
 
 import org.ofbiz.base.util.BshUtil;
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.GeneralException;
-import static org.ofbiz.base.util.UtilGenerics.cast;
 import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.base.util.cache.UtilCache;
 import org.ofbiz.service.GenericServiceException;
 import org.ofbiz.service.ModelService;
 import org.ofbiz.service.ServiceDispatcher;

Modified: ofbiz/branches/webhelp-2012-12-07/framework/service/src/org/ofbiz/service/engine/GroovyEngine.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/service/src/org/ofbiz/service/engine/GroovyEngine.java?rev=1418875&r1=1418874&r2=1418875&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/framework/service/src/org/ofbiz/service/engine/GroovyEngine.java
(original)
+++ ofbiz/branches/webhelp-2012-12-07/framework/service/src/org/ofbiz/service/engine/GroovyEngine.java
Sun Dec  9 10:06:52 2012
@@ -19,7 +19,6 @@
 package org.ofbiz.service.engine;
 
 import static org.ofbiz.base.util.UtilGenerics.cast;
-
 import groovy.lang.GroovyClassLoader;
 import groovy.lang.Script;
 
@@ -28,19 +27,26 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
+import javax.script.ScriptContext;
+
 import javolution.util.FastMap;
 
 import org.codehaus.groovy.control.CompilerConfiguration;
 import org.codehaus.groovy.runtime.InvokerHelper;
 import org.ofbiz.base.config.GenericConfigException;
-import org.ofbiz.base.util.*;
-import org.ofbiz.entity.GenericEntityException;
-import org.ofbiz.service.*;
+import org.ofbiz.base.util.Debug;
+import org.ofbiz.base.util.GeneralException;
+import org.ofbiz.base.util.GroovyUtil;
+import org.ofbiz.base.util.ScriptHelper;
+import org.ofbiz.base.util.ScriptUtil;
+import org.ofbiz.base.util.UtilValidate;
+import org.ofbiz.service.DispatchContext;
+import org.ofbiz.service.GenericServiceException;
+import org.ofbiz.service.ModelService;
+import org.ofbiz.service.ServiceDispatcher;
+import org.ofbiz.service.ServiceUtil;
 import org.ofbiz.service.config.ServiceConfigUtil;
 
-import javax.script.ScriptContext;
-import javax.script.ScriptException;
-
 /**
  * Groovy Script Service Engine
  */

Modified: ofbiz/branches/webhelp-2012-12-07/framework/service/src/org/ofbiz/service/engine/ScriptEngine.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/service/src/org/ofbiz/service/engine/ScriptEngine.java?rev=1418875&r1=1418874&r2=1418875&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/framework/service/src/org/ofbiz/service/engine/ScriptEngine.java
(original)
+++ ofbiz/branches/webhelp-2012-12-07/framework/service/src/org/ofbiz/service/engine/ScriptEngine.java
Sun Dec  9 10:06:52 2012
@@ -33,7 +33,6 @@ import javolution.util.FastMap;
 import org.ofbiz.base.util.Assert;
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.ScriptUtil;
-import org.ofbiz.entity.GenericEntityException;
 import org.ofbiz.service.DispatchContext;
 import org.ofbiz.service.GenericServiceException;
 import org.ofbiz.service.ModelService;

Modified: ofbiz/branches/webhelp-2012-12-07/framework/start/src/org/ofbiz/base/start/Start.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/start/src/org/ofbiz/base/start/Start.java?rev=1418875&r1=1418874&r2=1418875&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/framework/start/src/org/ofbiz/base/start/Start.java
(original)
+++ ofbiz/branches/webhelp-2012-12-07/framework/start/src/org/ofbiz/base/start/Start.java
Sun Dec  9 10:06:52 2012
@@ -200,6 +200,7 @@ public final class Start {
         // set the shutdown hook
         if (config.useShutdownHook) {
             Runtime.getRuntime().addShutdownHook(new Thread() {
+                @Override
                 public void run() {
                     shutdownServer();
                 }
@@ -238,7 +239,7 @@ public final class Start {
                     return;
                 }
                 try {
-                    String loaderClassName = (String) loaderMap.get("class");
+                    String loaderClassName = loaderMap.get("class");
                     Class<?> loaderClass = classloader.loadClass(loaderClassName);
                     StartupLoader loader = (StartupLoader) loaderClass.newInstance();
                     loader.load(config, loaderArgs.toArray(new String[loaderArgs.size()]));
@@ -444,6 +445,7 @@ public final class Start {
 
     private enum Control {
         SHUTDOWN {
+            @Override
             void processRequest(Start start, PrintWriter writer) {
                 if (start.serverState.get() == ServerState.STOPPING) {
                     writer.println("IN-PROGRESS");
@@ -455,11 +457,13 @@ public final class Start {
             }
         },
         STATUS {
+            @Override
             void processRequest(Start start, PrintWriter writer) {
                 writer.println(start.serverState.get());
             }
         },
         FAIL {
+            @Override
             void processRequest(Start start, PrintWriter writer) {
                 writer.println("FAIL");
             }
@@ -471,6 +475,7 @@ public final class Start {
     public enum ServerState {
         STARTING, RUNNING, STOPPING;
 
+        @Override
         public String toString() {
             return name().charAt(0) + name().substring(1).toLowerCase();
         }

Modified: ofbiz/branches/webhelp-2012-12-07/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java?rev=1418875&r1=1418874&r2=1418875&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java
(original)
+++ ofbiz/branches/webhelp-2012-12-07/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java
Sun Dec  9 10:06:52 2012
@@ -21,9 +21,6 @@ package org.ofbiz.webapp.control;
 import static org.ofbiz.base.util.UtilGenerics.checkMap;
 
 import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Collection;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Map;
@@ -38,8 +35,6 @@ import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import javolution.util.FastList;
-
 import org.ofbiz.base.util.CachedClassLoader;
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.StringUtil;

Modified: ofbiz/branches/webhelp-2012-12-07/framework/webapp/src/org/ofbiz/webapp/event/GroovyEventHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/webapp/src/org/ofbiz/webapp/event/GroovyEventHandler.java?rev=1418875&r1=1418874&r2=1418875&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/framework/webapp/src/org/ofbiz/webapp/event/GroovyEventHandler.java
(original)
+++ ofbiz/branches/webhelp-2012-12-07/framework/webapp/src/org/ofbiz/webapp/event/GroovyEventHandler.java
Sun Dec  9 10:06:52 2012
@@ -18,7 +18,14 @@
  */
 package org.ofbiz.webapp.event;
 
-import java.util.*;
+import groovy.lang.GroovyClassLoader;
+import groovy.lang.Script;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
 
 import javax.script.ScriptContext;
 import javax.servlet.ServletContext;
@@ -26,16 +33,16 @@ import javax.servlet.http.HttpServletReq
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
-import groovy.lang.GroovyClassLoader;
-import groovy.lang.Script;
 import org.codehaus.groovy.control.CompilerConfiguration;
 import org.codehaus.groovy.runtime.InvokerHelper;
-import javolution.util.FastMap;
-
 import org.ofbiz.base.config.GenericConfigException;
-import org.ofbiz.base.util.*;
-import org.ofbiz.entity.GenericEntityException;
-import org.ofbiz.service.ExecutionServiceException;
+import org.ofbiz.base.util.Debug;
+import org.ofbiz.base.util.GroovyUtil;
+import org.ofbiz.base.util.ScriptHelper;
+import org.ofbiz.base.util.ScriptUtil;
+import org.ofbiz.base.util.UtilHttp;
+import org.ofbiz.base.util.UtilMisc;
+import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.service.config.ServiceConfigUtil;
 import org.ofbiz.webapp.control.ConfigXMLReader.Event;
 import org.ofbiz.webapp.control.ConfigXMLReader.RequestMap;

Modified: ofbiz/branches/webhelp-2012-12-07/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizUrlTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizUrlTransform.java?rev=1418875&r1=1418874&r2=1418875&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizUrlTransform.java
(original)
+++ ofbiz/branches/webhelp-2012-12-07/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizUrlTransform.java
Sun Dec  9 10:06:52 2012
@@ -261,7 +261,7 @@ public class OfbizUrlTransform implement
     String value = "";
         try{
             NodeList nlList= eElement.getElementsByTagName(sTag).item(0).getChildNodes();
-            Node nValue = (Node) nlList.item(0);
+            Node nValue = nlList.item(0);
             return value = nValue.getNodeValue();
         } catch (Exception e) {
             return value;

Modified: ofbiz/branches/webhelp-2012-12-07/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java?rev=1418875&r1=1418874&r2=1418875&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java
(original)
+++ ofbiz/branches/webhelp-2012-12-07/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java
Sun Dec  9 10:06:52 2012
@@ -21,8 +21,8 @@ package org.ofbiz.webapp.view;
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URL;
 
@@ -35,19 +35,15 @@ import javax.xml.transform.URIResolver;
 import javax.xml.transform.sax.SAXResult;
 import javax.xml.transform.stream.StreamSource;
 
-import org.apache.fop.apps.Fop;
 import org.apache.fop.apps.FOPException;
-import org.apache.fop.apps.FopFactory;
 import org.apache.fop.apps.FOUserAgent;
+import org.apache.fop.apps.Fop;
+import org.apache.fop.apps.FopFactory;
 import org.apache.fop.apps.MimeConstants;
-
 import org.ofbiz.base.location.FlexibleLocation;
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.FileUtil;
-import org.ofbiz.base.util.UtilMisc;
-import org.ofbiz.base.util.UtilProperties;
 import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.base.util.string.FlexibleStringExpander;
 import org.ofbiz.entity.Delegator;
 import org.ofbiz.entity.DelegatorFactory;
 import org.ofbiz.entity.util.EntityUtilProperties;

Modified: ofbiz/branches/webhelp-2012-12-07/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ControllerViewArtifactInfo.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ControllerViewArtifactInfo.java?rev=1418875&r1=1418874&r2=1418875&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ControllerViewArtifactInfo.java
(original)
+++ ofbiz/branches/webhelp-2012-12-07/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ControllerViewArtifactInfo.java
Sun Dec  9 10:06:52 2012
@@ -22,7 +22,6 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Set;
 
-import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.GeneralException;
 import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.base.util.UtilObject;

Modified: ofbiz/branches/webhelp-2012-12-07/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelInfo.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelInfo.java?rev=1418875&r1=1418874&r2=1418875&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelInfo.java
(original)
+++ ofbiz/branches/webhelp-2012-12-07/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelInfo.java
Sun Dec  9 10:06:52 2012
@@ -23,7 +23,6 @@ import java.util.Map;
 import javolution.util.FastMap;
 
 import org.ofbiz.base.util.Debug;
-import org.ofbiz.base.util.GeneralException;
 import org.ofbiz.base.util.UtilValidate;
 
 public class LabelInfo {

Modified: ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/src/org/ofbiz/ecommerce/janrain/JanrainHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/src/org/ofbiz/ecommerce/janrain/JanrainHelper.java?rev=1418875&r1=1418874&r2=1418875&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/src/org/ofbiz/ecommerce/janrain/JanrainHelper.java
(original)
+++ ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/src/org/ofbiz/ecommerce/janrain/JanrainHelper.java
Sun Dec  9 10:06:52 2012
@@ -173,7 +173,7 @@ public class JanrainHelper {
             }
             post.close();
             Document tagXml = UtilXml.readXmlDocument(buf.toString());
-            Element response = (Element) tagXml.getDocumentElement();
+            Element response = tagXml.getDocumentElement();
             if (!response.getAttribute("stat").equals("ok")) {
                 throw new RuntimeException("Unexpected API error");
             }

Modified: ofbiz/branches/webhelp-2012-12-07/specialpurpose/googlebase/src/org/ofbiz/googlebase/GoogleBaseSearchEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/specialpurpose/googlebase/src/org/ofbiz/googlebase/GoogleBaseSearchEvents.java?rev=1418875&r1=1418874&r2=1418875&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/specialpurpose/googlebase/src/org/ofbiz/googlebase/GoogleBaseSearchEvents.java
(original)
+++ ofbiz/branches/webhelp-2012-12-07/specialpurpose/googlebase/src/org/ofbiz/googlebase/GoogleBaseSearchEvents.java
Sun Dec  9 10:06:52 2012
@@ -103,7 +103,7 @@ public class GoogleBaseSearchEvents {
                 String webSiteMountPoint = request.getParameter("webSiteMountPoint");
                 String countryCode = request.getParameter("countryCode");
                 String productStoreId = request.getParameter("productStoreId");
-                String allowRecommended = (String) request.getParameter("allowRecommended");
+                String allowRecommended = request.getParameter("allowRecommended");
 
                 // Export all or selected products to Google Base
                 try {

Modified: ofbiz/branches/webhelp-2012-12-07/specialpurpose/pos/src/org/ofbiz/pos/screen/PosDialog.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/specialpurpose/pos/src/org/ofbiz/pos/screen/PosDialog.java?rev=1418875&r1=1418874&r2=1418875&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/specialpurpose/pos/src/org/ofbiz/pos/screen/PosDialog.java
(original)
+++ ofbiz/branches/webhelp-2012-12-07/specialpurpose/pos/src/org/ofbiz/pos/screen/PosDialog.java
Sun Dec  9 10:06:52 2012
@@ -69,7 +69,7 @@ public class PosDialog {
     }
 
     public static PosDialog getInstance(XPage page, boolean modal, int padding) {
-        PosDialog dialog = (PosDialog) instances.get(page);
+        PosDialog dialog = instances.get(page);
         if (dialog == null) {
             dialog = instances.putIfAbsentAndGet(page, new PosDialog(page, modal, padding));
         }

Modified: ofbiz/branches/webhelp-2012-12-07/specialpurpose/webpos/src/org/ofbiz/webpos/WebPosEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/specialpurpose/webpos/src/org/ofbiz/webpos/WebPosEvents.java?rev=1418875&r1=1418874&r2=1418875&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/specialpurpose/webpos/src/org/ofbiz/webpos/WebPosEvents.java
(original)
+++ ofbiz/branches/webhelp-2012-12-07/specialpurpose/webpos/src/org/ofbiz/webpos/WebPosEvents.java
Sun Dec  9 10:06:52 2012
@@ -55,7 +55,7 @@ public class WebPosEvents {
         HttpSession session = request.getSession(true);
         
         // get the posTerminalId
-        String posTerminalId = (String) request.getParameter("posTerminalId");
+        String posTerminalId = request.getParameter("posTerminalId");
         session.removeAttribute("shoppingCart");
         session.removeAttribute("webPosSession");
         WebPosSession webPosSession = WebPosEvents.getWebPosSession(request, posTerminalId);
@@ -186,7 +186,7 @@ public class WebPosEvents {
                                             List<String> featureOrder = FastList.newInstance();
                                             featureOrder = UtilMisc.toList(featureSet);
                                             for (int i=0; i < featureOrder.size(); i++)
{
-                                                String featureKey = (String) featureOrder.get(i);
+                                                String featureKey = featureOrder.get(i);
                                                 GenericValue featureValue = delegator.findOne("ProductFeatureType",
UtilMisc.toMap("productFeatureTypeId", featureOrder.get(i)), true);
                                                 if (UtilValidate.isNotEmpty(featureValue)
&& 
                                                     UtilValidate.isNotEmpty(featureValue.get("description")))
{

Modified: ofbiz/branches/webhelp-2012-12-07/specialpurpose/webpos/src/org/ofbiz/webpos/transaction/WebPosTransaction.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/specialpurpose/webpos/src/org/ofbiz/webpos/transaction/WebPosTransaction.java?rev=1418875&r1=1418874&r2=1418875&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/specialpurpose/webpos/src/org/ofbiz/webpos/transaction/WebPosTransaction.java
(original)
+++ ofbiz/branches/webhelp-2012-12-07/specialpurpose/webpos/src/org/ofbiz/webpos/transaction/WebPosTransaction.java
Sun Dec  9 10:06:52 2012
@@ -329,7 +329,7 @@ public class WebPosTransaction {
             boolean isExternal = true;
             Iterator<GenericValue> i = values.iterator();
             while (i.hasNext() && isExternal) {
-                GenericValue v = (GenericValue) i.next();
+                GenericValue v = i.next();
                 //Debug.logInfo("Testing [" + paymentMethodTypeId + "] - " + v, module);
                 if (!externalCode.equals(v.getString("paymentServiceTypeEnumId"))) {
                     isExternal = false;



Mime
View raw message