You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mt...@apache.org on 2019/04/21 10:55:18 UTC
svn commit: r1857904 - in /ofbiz/ofbiz-framework/trunk:
applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/
applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/
applications/marketing/src/main/java/org/apache/o...
Author: mthl
Date: Sun Apr 21 10:55:18 2019
New Revision: 1857904
URL: http://svn.apache.org/viewvc?rev=1857904&view=rev
Log:
Fixed: Remove unnecessary semicolons in Java code (OFBIZ-10936)
Modified:
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java
ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java
ofbiz/ofbiz-framework/trunk/applications/marketing/src/main/java/org/apache/ofbiz/sfa/vcard/VCard.java
ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalWorker.java
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/config/JNDIConfigUtil.java
ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/telecom/TelecomServices.java
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityCrypto.java
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntitySaxReader.java
ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/job/Job.java
ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/Config.java
ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java
ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/XmlWidgetConditionVisitor.java
ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/XmlWidgetVisitor.java
Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java?rev=1857904&r1=1857903&r2=1857904&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java Sun Apr 21 10:55:18 2019
@@ -2076,7 +2076,7 @@ public class InvoiceServices {
String invoiceId = (String) serviceResults.get("invoiceId");
// keep track of the invoice total vs the promised return total (how much the customer promised to return)
- BigDecimal invoiceTotal = BigDecimal.ZERO;;
+ BigDecimal invoiceTotal = BigDecimal.ZERO;
BigDecimal promisedTotal = BigDecimal.ZERO;
// loop through shipment receipts to create invoice items and return item billings for each item and adjustment
Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java?rev=1857904&r1=1857903&r2=1857904&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java (original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java Sun Apr 21 10:55:18 2019
@@ -162,7 +162,7 @@ public class EditRenderSubContentCacheTr
templateRoot.put("context", templateCtx);
if (Debug.verboseOn()) {
for (Entry<String, Object> ky : templateCtx.entrySet()) {
- Object val = ky.getValue();;
+ Object val = ky.getValue();
Debug.logVerbose("context key: " + ky + " val: " + val, module);
}
}
Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/src/main/java/org/apache/ofbiz/sfa/vcard/VCard.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/src/main/java/org/apache/ofbiz/sfa/vcard/VCard.java?rev=1857904&r1=1857903&r2=1857904&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/marketing/src/main/java/org/apache/ofbiz/sfa/vcard/VCard.java (original)
+++ ofbiz/ofbiz-framework/trunk/applications/marketing/src/main/java/org/apache/ofbiz/sfa/vcard/VCard.java Sun Apr 21 10:55:18 2019
@@ -264,7 +264,7 @@ public class VCard {
if (countryGeo != null) {
String country = postalAddress.getRelatedOne("CountryGeo", false).getString("geoName");
address.setCountry(country);
- address.getTypes().add(AddressType.WORK);;
+ address.getTypes().add(AddressType.WORK);
//TODO : this can be better set by checking contactMechPurposeTypeId
}
vcard.addAddress(address);
Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalWorker.java?rev=1857904&r1=1857903&r2=1857904&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalWorker.java (original)
+++ ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalWorker.java Sun Apr 21 10:55:18 2019
@@ -61,7 +61,7 @@ public final class ICalWorker {
public static final String module = ICalWorker.class.getName();
- private ICalWorker() {};
+ private ICalWorker() {}
public static final class ResponseProperties {
public final int statusCode;
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/config/JNDIConfigUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/config/JNDIConfigUtil.java?rev=1857904&r1=1857903&r2=1857904&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/config/JNDIConfigUtil.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/config/JNDIConfigUtil.java Sun Apr 21 10:55:18 2019
@@ -33,7 +33,7 @@ public final class JNDIConfigUtil {
public static final String module = JNDIConfigUtil.class.getName();
private static final String JNDI_CONFIG_XML_FILENAME = "jndiservers.xml";
private static final ConcurrentHashMap<String, JndiServerInfo> jndiServerInfos = new ConcurrentHashMap<>();
- private JNDIConfigUtil() {};
+ private JNDIConfigUtil() {}
private static Element getXmlRootElement() throws GenericConfigException {
try {
Modified: ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/telecom/TelecomServices.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/telecom/TelecomServices.java?rev=1857904&r1=1857903&r2=1857904&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/telecom/TelecomServices.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/telecom/TelecomServices.java Sun Apr 21 10:55:18 2019
@@ -51,7 +51,7 @@ public class TelecomServices {
String telecomMsgTypeEnumId = (String) context.get("telecomMsgTypeEnumId");
String telecomMethodTypeId = (String) context.get("telecomMethodTypeId");
String telecomGatewayConfigId = (String) context.get("telecomGatewayConfigId");
- List<String> numbers = checkList(context.get("numbers"), String.class);;
+ List<String> numbers = checkList(context.get("numbers"), String.class);
String message = (String) context.get("message");
String telecomEnabled = EntityUtilProperties.getPropertyValue("general", "telecom.notifications.enabled", delegator);
Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityCrypto.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityCrypto.java?rev=1857904&r1=1857903&r2=1857904&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityCrypto.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityCrypto.java Sun Apr 21 10:55:18 2019
@@ -325,7 +325,7 @@ public final class EntityCrypto {
protected String encryptValue(EncryptMethod encryptMethod, byte[] key, byte[] objBytes) throws GeneralException {
return StringUtil.toHexString(DesCrypt.encrypt(DesCrypt.getDesKey(key), objBytes));
}
- };
+ }
protected static final StorageHandler OldFunnyHashStorageHandler = new LegacyStorageHandler() {
@Override
@@ -432,5 +432,5 @@ public final class EntityCrypto {
String result = Base64.encodeBase64String(DesCrypt.encrypt(DesCrypt.getDesKey(key), allBytes));
return result;
}
- };
+ }
}
Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntitySaxReader.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntitySaxReader.java?rev=1857904&r1=1857903&r2=1857904&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntitySaxReader.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntitySaxReader.java Sun Apr 21 10:55:18 2019
@@ -97,7 +97,7 @@ public class EntitySaxReader extends Def
private boolean createDummyFks = false;
private boolean checkDataOnly = false;
private boolean continueOnFail = false;
- private enum Action {CREATE, CREATE_UPDATE, CREATE_REPLACE, DELETE};
+ private enum Action {CREATE, CREATE_UPDATE, CREATE_REPLACE, DELETE}
private List<String> actionTags = UtilMisc.toList("create", "create-update", "create-replace", "delete");
private Action currentAction = Action.CREATE_UPDATE;
private List<Object> messageList = null;
Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/job/Job.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/job/Job.java?rev=1857904&r1=1857903&r2=1857904&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/job/Job.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/job/Job.java Sun Apr 21 10:55:18 2019
@@ -29,7 +29,7 @@ import java.util.Date;
*/
public interface Job extends Runnable {
- public static enum State {CREATED, QUEUED, RUNNING, FINISHED, FAILED};
+ public static enum State {CREATED, QUEUED, RUNNING, FINISHED, FAILED}
/**
* Returns the current state of this job.
Modified: ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/Config.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/Config.java?rev=1857904&r1=1857903&r2=1857904&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/Config.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/Config.java Sun Apr 21 10:55:18 2019
@@ -49,7 +49,7 @@ public final class Config {
Config(List<StartupCommand> ofbizCommands) throws StartupException {
// fetch OFBiz Properties object
- Properties props = getPropertiesFile(ofbizCommands);;
+ Properties props = getPropertiesFile(ofbizCommands);
// set this class fields
ofbizHome = getOfbizHome(getProperty(props, "ofbiz.home", "."));
Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java?rev=1857904&r1=1857903&r2=1857904&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java Sun Apr 21 10:55:18 2019
@@ -228,7 +228,7 @@ public class LabelManagerFactory {
label = new LabelInfo(key, keyComment, fileName, localeName, localeValue, localeComment);
labels.put(key + keySeparator + fileName, label);
} catch (Exception e) {
- Debug.logError(e, module);;
+ Debug.logError(e, module);
}
} else {
label.setLabelKeyComment(keyComment);
Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/XmlWidgetConditionVisitor.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/XmlWidgetConditionVisitor.java?rev=1857904&r1=1857903&r2=1857904&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/XmlWidgetConditionVisitor.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/XmlWidgetConditionVisitor.java Sun Apr 21 10:55:18 2019
@@ -138,7 +138,6 @@ public class XmlWidgetConditionVisitor e
visitAttribute("disabled-style", modelMenuCondition.getFailStyleExdr());
writer.append("/>");
modelMenuCondition.getCondition().accept(this);
- ;
writer.append("</condition>");
}
Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/XmlWidgetVisitor.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/XmlWidgetVisitor.java?rev=1857904&r1=1857903&r2=1857904&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/XmlWidgetVisitor.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/XmlWidgetVisitor.java Sun Apr 21 10:55:18 2019
@@ -339,7 +339,6 @@ public class XmlWidgetVisitor extends Xm
}
for (ModelMenuItem menuItem : modelMenuItem.getMenuItemList()) {
menuItem.accept(this);
- ;
}
writer.append("</menu-item>");
}