You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by le...@apache.org on 2012/12/08 13:06:42 UTC
svn commit: r1418651 - in /ofbiz/trunk:
applications/content/src/org/ofbiz/content/content/
applications/content/src/org/ofbiz/content/webapp/ftl/
applications/order/src/org/ofbiz/order/shoppingcart/
applications/product/src/org/ofbiz/product/category/...
Author: lektran
Date: Sat Dec 8 12:06:40 2012
New Revision: 1418651
URL: http://svn.apache.org/viewvc?rev=1418651&view=rev
Log:
Add a bunch of missing Override annotations
Modified:
ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentUrlFilter.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/OfbizContentAltUrlTransforms.java
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/category/OfbizCatalogAltUrlTransform.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/CompilerMatcher.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ScriptUtil.java
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityCrypto.java
ofbiz/trunk/framework/start/src/org/ofbiz/base/start/Start.java
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentUrlFilter.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentUrlFilter.java?rev=1418651&r1=1418650&r2=1418651&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentUrlFilter.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentUrlFilter.java Sat Dec 8 12:06:40 2012
@@ -56,6 +56,7 @@ public class ContentUrlFilter extends Co
protected static String redirectUrl = null;
public static String defaultViewRequest = "contentViewInfo";
+ @Override
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
HttpServletRequest httpRequest = (HttpServletRequest) request;
HttpServletResponse httpResponse = (HttpServletResponse) response;
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/OfbizContentAltUrlTransforms.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/OfbizContentAltUrlTransforms.java?rev=1418651&r1=1418650&r2=1418651&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/OfbizContentAltUrlTransforms.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/OfbizContentAltUrlTransforms.java Sat Dec 8 12:06:40 2012
@@ -62,14 +62,17 @@ public class OfbizContentAltUrlTransform
final StringBuilder buf = new StringBuilder();
return new Writer(out) {
+ @Override
public void write(char[] cbuf, int off, int len) throws IOException {
buf.append(cbuf, off, len);
}
+ @Override
public void flush() throws IOException {
out.flush();
}
+ @Override
public void close() throws IOException {
try {
Environment env = Environment.getCurrentEnvironment();
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java?rev=1418651&r1=1418650&r2=1418651&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java Sat Dec 8 12:06:40 2012
@@ -4287,6 +4287,7 @@ public class ShoppingCart implements Ite
}
}
+ @Override
public boolean equals(java.lang.Object obj) {
if (obj instanceof BasePriceOrderComparator) {
return this.ascending == ((BasePriceOrderComparator) obj).ascending;
@@ -4358,6 +4359,7 @@ public class ShoppingCart implements Ite
}
}
+ @Override
public boolean equals(Object obj) {
if (obj == null) return false;
ShoppingCartItemGroup that = (ShoppingCartItemGroup) obj;
@@ -4963,11 +4965,13 @@ public class ShoppingCart implements Ite
}
}
+ @Override
public String toString() {
return "Pm: " + paymentMethodId + " / PmType: " + paymentMethodTypeId + " / Amt: " + amount + " / Ref: " + refNum[0] + "!" + refNum[1];
}
}
+ @Override
protected void finalize() throws Throwable {
// DEJ20050518 we should not call clear because it kills the auto-save shopping list and is unnecessary given that when this object is GC'ed it will cause everything it points to that isn't referenced anywhere else to be GC'ed too: this.clear();
super.finalize();
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/category/OfbizCatalogAltUrlTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/category/OfbizCatalogAltUrlTransform.java?rev=1418651&r1=1418650&r2=1418651&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/category/OfbizCatalogAltUrlTransform.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/category/OfbizCatalogAltUrlTransform.java Sat Dec 8 12:06:40 2012
@@ -86,14 +86,17 @@ public class OfbizCatalogAltUrlTransform
return new Writer(out) {
+ @Override
public void write(char[] cbuf, int off, int len) throws IOException {
buf.append(cbuf, off, len);
}
+ @Override
public void flush() throws IOException {
out.flush();
}
+ @Override
public void close() throws IOException {
try {
Environment env = Environment.getCurrentEnvironment();
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/CompilerMatcher.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/CompilerMatcher.java?rev=1418651&r1=1418650&r2=1418651&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/CompilerMatcher.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/CompilerMatcher.java Sat Dec 8 12:06:40 2012
@@ -50,6 +50,7 @@ public class CompilerMatcher {
public static ThreadLocal<CompilerMatcher> getThreadLocal() {
return new ThreadLocal<CompilerMatcher>() {
+ @Override
protected CompilerMatcher initialValue() {
return new CompilerMatcher();
}
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ScriptUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ScriptUtil.java?rev=1418651&r1=1418650&r2=1418651&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ScriptUtil.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ScriptUtil.java Sat Dec 8 12:06:40 2012
@@ -438,12 +438,14 @@ public final class ScriptUtil {
public Set<java.util.Map.Entry<String, Object>> entrySet() {
return bindings.entrySet();
}
+ @Override
public boolean equals(Object o) {
return bindings.equals(o);
}
public Object get(Object key) {
return bindings.get(key);
}
+ @Override
public int hashCode() {
return bindings.hashCode();
}
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityCrypto.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityCrypto.java?rev=1418651&r1=1418650&r2=1418651&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityCrypto.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityCrypto.java Sat Dec 8 12:06:40 2012
@@ -216,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}";
}
@@ -260,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) {
@@ -276,6 +287,7 @@ public final class EntityCrypto {
return keyBytes;
}
+ @Override
protected String encodeKey(SecretKey key) throws GeneralException {
byte[] keyBytes = key.getEncoded();
if (kek != null) {
@@ -284,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];
@@ -292,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/trunk/framework/start/src/org/ofbiz/base/start/Start.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/start/src/org/ofbiz/base/start/Start.java?rev=1418651&r1=1418650&r2=1418651&view=diff
==============================================================================
--- ofbiz/trunk/framework/start/src/org/ofbiz/base/start/Start.java (original)
+++ ofbiz/trunk/framework/start/src/org/ofbiz/base/start/Start.java Sat Dec 8 12:06:40 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();
}
@@ -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();
}