svn commit: r791212 [6/8] - in /ofbiz/trunk: ./ applications/accounting/src/or
Locked
svn commit: r791212 [6/8] - in /ofbiz/trunk: ./ applications/accounting/src/or
 
|
Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelParam.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelParam.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelParam.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelParam.java Sun Jul 5 10:01:19 2009 @@ -181,6 +181,7 @@ return model.name.equals(this.name); } + @Override public String toString() { StringBuilder buf = new StringBuilder(); buf.append(name).append("::"); @@ -279,6 +280,7 @@ return null; } + @Override public String toString() { return className + "::" + methodName + "::" + failMessage + "::" + failResource + "::" + failProperty; } Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java Sun Jul 5 10:01:19 2009 @@ -229,6 +229,7 @@ } } + @Override public Object get(Object name) { Field field = MODEL_SERVICE_FIELD_MAP.get(name.toString()); if (field != null) { @@ -264,10 +265,12 @@ throw new UnsupportedOperationException(); } + @Override public int hashCode() { return field.hashCode() ^ System.identityHashCode(ModelService.this); } + @Override public boolean equals(Object o) { if (!(o instanceof ModelServiceMapEntry)) return false; ModelServiceMapEntry other = (ModelServiceMapEntry) o; @@ -279,12 +282,15 @@ } } + @Override public Set<Map.Entry<String, Object>> entrySet() { return new AbstractSet<Map.Entry<String, Object>>() { + @Override public int size() { return MODEL_SERVICE_FIELDS.length; } + @Override public Iterator<Map.Entry<String, Object>> iterator() { return new Iterator<Map.Entry<String, Object>>() { private int i = 0; @@ -305,10 +311,12 @@ }; } + @Override public Object put(String o1, Object o2) { return null; } + @Override public String toString() { StringBuilder buf = new StringBuilder(); buf.append(name).append("::"); Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelServiceIface.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelServiceIface.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelServiceIface.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelServiceIface.java Sun Jul 5 10:01:19 2009 @@ -48,6 +48,7 @@ this.optional = optional; } + @Override public String toString() { return "[" + service + ":" + optional + "]"; } Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/RunningService.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/RunningService.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/RunningService.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/RunningService.java Sun Jul 5 10:01:19 2009 @@ -67,6 +67,7 @@ this.endStamp = UtilDateTime.nowTimestamp(); } + @Override public boolean equals(Object o) { if (o != null && o instanceof RunningService) { RunningService x = (RunningService) o; Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceValidationException.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceValidationException.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceValidationException.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceValidationException.java Sun Jul 5 10:01:19 2009 @@ -105,6 +105,7 @@ return missingFields; } + @Override public List<String> getMessageList() { if (this.messages == null || this.messages.size() == 0) { return null; @@ -128,6 +129,7 @@ } } + @Override public String getMessage() { String msg = super.getMessage(); if (UtilValidate.isNotEmpty(this.messages)) { Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceXaWrapper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceXaWrapper.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceXaWrapper.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceXaWrapper.java Sun Jul 5 10:01:19 2009 @@ -144,6 +144,7 @@ return this.rollbackContext; } + @Override public void enlist() throws XAException { super.enlist(); if (Debug.verboseOn()) Debug.logVerbose("Enlisted in transaction : " + this.toString(), module); @@ -153,6 +154,7 @@ /** * @see javax.transaction.xa.XAResource#commit(javax.transaction.xa.Xid xid, boolean onePhase) */ + @Override public void commit(Xid xid, boolean onePhase) throws XAException { if (Debug.verboseOn()) Debug.logVerbose("ServiceXaWrapper#commit() : " + onePhase + " / " + xid.toString(), module); // the commit listener @@ -169,6 +171,7 @@ final boolean async = commitAsync; Thread thread = new Thread() { + @Override public void run() { try { runService(service, context, persist, (async ? MODE_ASYNC : MODE_SYNC), TYPE_COMMIT); @@ -186,6 +189,7 @@ /** * @see javax.transaction.xa.XAResource#rollback(javax.transaction.xa.Xid xid) */ + @Override public void rollback(Xid xid) throws XAException { if (Debug.verboseOn()) Debug.logVerbose("ServiceXaWrapper#rollback() : " + xid.toString(), module); // the rollback listener @@ -202,6 +206,7 @@ final boolean async = rollbackAsync; Thread thread = new Thread() { + @Override public void run() { try { runService(service, context, persist, (async ? MODE_ASYNC : MODE_SYNC), TYPE_ROLLBACK); @@ -216,6 +221,7 @@ this.active = false; } + @Override public int prepare(Xid xid) throws XAException { // overriding to log two phase commits if (Debug.verboseOn()) Debug.logVerbose("ServiceXaWrapper#prepare() : " + xid.toString(), module); Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceInfo.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceInfo.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceInfo.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceInfo.java Sun Jul 5 10:01:19 2009 @@ -350,6 +350,7 @@ public RecurrenceWrapper(RecurrenceInfo info) { this.info = info; } + @Override public Calendar first(Calendar cal) { long result = this.info.first(); if (result == 0) { @@ -359,9 +360,11 @@ first.setTimeInMillis(result); return first; } + @Override public boolean includesDate(Calendar cal) { return this.info.isValidCurrent(cal.getTimeInMillis()); } + @Override public Calendar next(Calendar cal) { long result = this.info.next(cal.getTimeInMillis()); if (result == 0) { @@ -371,6 +374,7 @@ next.setTimeInMillis(result); return next; } + @Override public void accept(TemporalExpressionVisitor visitor) {} } } Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/TemporalExpressions.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/TemporalExpressions.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/TemporalExpressions.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/TemporalExpressions.java Sun Jul 5 10:01:19 2009 @@ -38,15 +38,19 @@ /** This class represents a null expression. */ public static class Null extends TemporalExpression { + @Override public Calendar first(Calendar cal) { return null; } + @Override public boolean includesDate(Calendar cal) { return false; } + @Override public Calendar next(Calendar cal) { return null; } + @Override public void accept(TemporalExpressionVisitor visitor) { visitor.visit(this); } @@ -77,6 +81,7 @@ } } + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -87,10 +92,12 @@ return false; } + @Override public String toString() { return super.toString() + ", size = " + this.expressionSet.size(); } + @Override public boolean includesDate(Calendar cal) { for (TemporalExpression expression : this.expressionSet) { if (expression.includesDate(cal)) { @@ -100,6 +107,7 @@ return false; } + @Override public Calendar first(Calendar cal) { for (TemporalExpression expression : this.expressionSet) { Calendar first = expression.first(cal); @@ -110,6 +118,7 @@ return null; } + @Override public Calendar next(Calendar cal) { for (TemporalExpression expression : this.expressionSet) { Calendar next = expression.next(cal); @@ -120,10 +129,12 @@ return null; } + @Override public void accept(TemporalExpressionVisitor visitor) { visitor.visit(this); } + @Override public Set<Date> getRange(org.ofbiz.base.util.DateRange range, Calendar cal) { Set<Date> rawSet = new TreeSet<Date>(); Set<Date> finalSet = new TreeSet<Date>(); @@ -148,6 +159,7 @@ return Collections.unmodifiableSet(this.expressionSet); } + @Override protected boolean containsExpression(TemporalExpression expression) { for (TemporalExpression setItem : this.expressionSet) { if (setItem.containsExpression(expression)) { @@ -183,6 +195,7 @@ } } + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -193,10 +206,12 @@ return false; } + @Override public String toString() { return super.toString() + ", size = " + this.expressionSet.size(); } + @Override public boolean includesDate(Calendar cal) { for (TemporalExpression expression : this.expressionSet) { if (!expression.includesDate(cal)) { @@ -206,6 +221,7 @@ return true; } + @Override public Calendar first(Calendar cal) { Calendar first = (Calendar) cal.clone(); for (TemporalExpression expression : this.expressionSet) { @@ -221,6 +237,7 @@ } } + @Override public Calendar next(Calendar cal) { Calendar next = (Calendar) cal.clone(); for (TemporalExpression expression : this.expressionSet) { @@ -236,10 +253,12 @@ } } + @Override public void accept(TemporalExpressionVisitor visitor) { visitor.visit(this); } + @Override public Set<Date> getRange(org.ofbiz.base.util.DateRange range, Calendar cal) { Set<Date> finalSet = new TreeSet<Date>(); Set<Date> rawSet = new TreeSet<Date>(); @@ -271,6 +290,7 @@ return Collections.unmodifiableSet(this.expressionSet); } + @Override protected boolean containsExpression(TemporalExpression expression) { for (TemporalExpression setItem : this.expressionSet) { if (setItem.containsExpression(expression)) { @@ -304,6 +324,7 @@ } } + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -315,14 +336,17 @@ return false; } + @Override public String toString() { return super.toString() + ", included = " + this.included + ", excluded = " + this.excluded; } + @Override public boolean includesDate(Calendar cal) { return this.included.includesDate(cal) && !this.excluded.includesDate(cal); } + @Override public Calendar first(Calendar cal) { Calendar first = this.included.first(cal); while (first != null && this.excluded.includesDate(first)) { @@ -331,6 +355,7 @@ return first; } + @Override public Calendar next(Calendar cal) { Calendar next = this.included.next(cal); while (next != null && this.excluded.includesDate(next)) { @@ -339,10 +364,12 @@ return next; } + @Override public void accept(TemporalExpressionVisitor visitor) { visitor.visit(this); } + @Override public Set<Date> getRange(org.ofbiz.base.util.DateRange range, Calendar cal) { Set<Date> finalSet = new TreeSet<Date>(); Set<Date> rawSet = this.included.getRange(range, cal); @@ -370,6 +397,7 @@ return this.included; } + @Override protected boolean containsExpression(TemporalExpression expression) { return this.included.containsExpression(expression) || this.excluded.containsExpression(expression); } @@ -387,6 +415,7 @@ } } + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -397,22 +426,27 @@ return false; } + @Override public String toString() { return super.toString() + ", start = " + this.range.start() + ", end = " + this.range.end(); } + @Override public boolean includesDate(Calendar cal) { return this.range.includesDate(cal.getTime()); } + @Override public Calendar first(Calendar cal) { return includesDate(cal) ? cal : null; } + @Override public Calendar next(Calendar cal) { return includesDate(cal) ? cal : null; } + @Override public void accept(TemporalExpressionVisitor visitor) { visitor.visit(this); } @@ -489,6 +523,7 @@ } } + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -500,11 +535,13 @@ return false; } + @Override public String toString() { return super.toString() + ", start = " + this.startStr + ", end = " + this.endStr + ", interval = " + this.interval + ", count = " + this.count; } + @Override public boolean includesDate(Calendar cal) { long millis = cal.getTimeInMillis(); Calendar startCal = setStart(cal); @@ -517,6 +554,7 @@ return millis >= startMillis && millis <= endMillis; } + @Override public Calendar first(Calendar cal) { if (includesDate(cal)) { return cal; @@ -524,6 +562,7 @@ return next(cal); } + @Override public Calendar next(Calendar cal) { Calendar next = (Calendar) cal.clone(); next.add(this.interval, this.count); @@ -569,6 +608,7 @@ return this.startSecs; } + @Override public void accept(TemporalExpressionVisitor visitor) { visitor.visit(this); } @@ -618,6 +658,7 @@ } } + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -629,10 +670,12 @@ return false; } + @Override public String toString() { return super.toString() + ", start = " + this.start + ", end = " + this.end; } + @Override public boolean includesDate(Calendar cal) { int dow = cal.get(Calendar.DAY_OF_WEEK); if (dow == this.start || dow == this.end) { @@ -651,6 +694,7 @@ return false; } + @Override public Calendar first(Calendar cal) { Calendar first = (Calendar) cal.clone(); while (!includesDate(first)) { @@ -659,6 +703,7 @@ return setStartOfDay(first); } + @Override public Calendar next(Calendar cal) { Calendar next = (Calendar) cal.clone(); next.add(Calendar.DAY_OF_MONTH, 1); @@ -668,6 +713,7 @@ return setStartOfDay(next); } + @Override public void accept(TemporalExpressionVisitor visitor) { visitor.visit(this); } @@ -714,6 +760,7 @@ } } + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -725,10 +772,12 @@ return false; } + @Override public String toString() { return super.toString() + ", start = " + this.start + ", end = " + this.end; } + @Override public boolean includesDate(Calendar cal) { int month = cal.get(Calendar.MONTH); if (month == this.start || month == this.end) { @@ -747,6 +796,7 @@ return false; } + @Override public Calendar first(Calendar cal) { Calendar first = (Calendar) cal.clone(); first.set(Calendar.DAY_OF_MONTH, 1); @@ -756,6 +806,7 @@ return first; } + @Override public Calendar next(Calendar cal) { Calendar next = (Calendar) cal.clone(); next.set(Calendar.DAY_OF_MONTH, 1); @@ -766,6 +817,7 @@ return next; } + @Override public void accept(TemporalExpressionVisitor visitor) { visitor.visit(this); } @@ -810,6 +862,7 @@ } } + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -821,15 +874,18 @@ return false; } + @Override public String toString() { return super.toString() + ", start = " + this.start + ", end = " + this.end; } + @Override public boolean includesDate(Calendar cal) { int dom = cal.get(Calendar.DAY_OF_MONTH); return dom >= this.start && dom <= this.end; } + @Override public Calendar first(Calendar cal) { Calendar first = setStartOfDay((Calendar) cal.clone()); while (!includesDate(first)) { @@ -838,6 +894,7 @@ return first; } + @Override public Calendar next(Calendar cal) { Calendar next = setStartOfDay((Calendar) cal.clone()); next.add(Calendar.DAY_OF_MONTH, 1); @@ -847,6 +904,7 @@ return next; } + @Override public void accept(TemporalExpressionVisitor visitor) { visitor.visit(this); } @@ -892,6 +950,7 @@ } } + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -903,10 +962,12 @@ return false; } + @Override public String toString() { return super.toString() + ", dayOfWeek = " + this.dayOfWeek + ", occurrence = " + this.occurrence; } + @Override public boolean includesDate(Calendar cal) { if (cal.get(Calendar.DAY_OF_WEEK) != this.dayOfWeek) { return false; @@ -918,6 +979,7 @@ return dom == next.get(Calendar.DAY_OF_MONTH) && next.get(Calendar.MONTH) == month; } + @Override public Calendar first(Calendar cal) { int month = cal.get(Calendar.MONTH); Calendar first = setStartOfDay(alignDayOfWeek((Calendar) cal.clone())); @@ -931,6 +993,7 @@ return first; } + @Override public Calendar next(Calendar cal) { int month = cal.get(Calendar.MONTH); Calendar next = setStartOfDay(alignDayOfWeek((Calendar) cal.clone())); @@ -944,6 +1007,7 @@ return next; } + @Override public void accept(TemporalExpressionVisitor visitor) { visitor.visit(this); } @@ -1017,6 +1081,7 @@ } } + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -1028,15 +1093,18 @@ return false; } + @Override public String toString() { return super.toString() + ", start = " + this.start + ", freqType = " + this.freqType + ", freqCount = " + this.freqCount; } + @Override public boolean includesDate(Calendar cal) { Calendar next = first(cal); return next.equals(cal); } + @Override public Calendar first(Calendar cal) { Calendar first = prepareCal(cal); while (first.before(cal)) { @@ -1045,6 +1113,7 @@ return first; } + @Override public Calendar next(Calendar cal) { Calendar next = first(cal); if (next.equals(cal)) { @@ -1053,6 +1122,7 @@ return next; } + @Override public void accept(TemporalExpressionVisitor visitor) { visitor.visit(this); } Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java Sun Jul 5 10:01:19 2009 @@ -239,6 +239,7 @@ return success; } + @Override public boolean equals(Object obj) { if (obj instanceof ServiceEcaAction) { ServiceEcaAction other = (ServiceEcaAction) obj; Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaCondition.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaCondition.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaCondition.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaCondition.java Sun Jul 5 10:01:19 2009 @@ -197,6 +197,7 @@ } } + @Override public String toString() { StringBuilder buf = new StringBuilder(); @@ -212,6 +213,7 @@ return buf.toString(); } + @Override public boolean equals(Object obj) { if (obj instanceof ServiceEcaCondition) { ServiceEcaCondition other = (ServiceEcaCondition) obj; Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaRule.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaRule.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaRule.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaRule.java Sun Jul 5 10:01:19 2009 @@ -171,6 +171,7 @@ return this.enabled; } + @Override public boolean equals(Object obj) { if (obj instanceof ServiceEcaRule) { ServiceEcaRule other = (ServiceEcaRule) obj; @@ -189,6 +190,7 @@ } } + @Override public String toString() { return "ServiceEcaRule:" + this.serviceName + ":" + this.eventName + ":runOnError=" + this.runOnError + ":runOnFailure=" + this.runOnFailure + ":enabled=" + this.enabled + ":conditions=" + this.conditions + ":actionsAndSets=" + this.actionsAndSets; } Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaSetField.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaSetField.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaSetField.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaSetField.java Sun Jul 5 10:01:19 2009 @@ -141,6 +141,7 @@ return s; } + @Override public boolean equals(Object obj) { if (obj instanceof ServiceEcaSetField) { ServiceEcaSetField other = (ServiceEcaSetField) obj; Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/BSFEngine.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/BSFEngine.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/BSFEngine.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/BSFEngine.java Sun Jul 5 10:01:19 2009 @@ -49,6 +49,7 @@ /** * @see org.ofbiz.service.engine.GenericEngine#runSyncIgnore(java.lang.String, org.ofbiz.service.ModelService, java.util.Map) */ + @Override public void runSyncIgnore(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException { runSync(localName, modelService, context); } @@ -56,6 +57,7 @@ /** * @see org.ofbiz.service.engine.GenericEngine#runSync(java.lang.String, org.ofbiz.service.ModelService, java.util.Map) */ + @Override public Map<String, Object> runSync(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException { Object result = serviceInvoker(localName, modelService, context); Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/BeanShellEngine.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/BeanShellEngine.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/BeanShellEngine.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/BeanShellEngine.java Sun Jul 5 10:01:19 2009 @@ -45,6 +45,7 @@ /** * @see org.ofbiz.service.engine.GenericEngine#runSyncIgnore(java.lang.String, org.ofbiz.service.ModelService, java.util.Map) */ + @Override public void runSyncIgnore(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException { runSync(localName, modelService, context); } @@ -52,6 +53,7 @@ /** * @see org.ofbiz.service.engine.GenericEngine#runSync(java.lang.String, org.ofbiz.service.ModelService, java.util.Map) */ + @Override public Map<String, Object> runSync(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException { return serviceInvoker(localName, modelService, context); } Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/EntityAutoEngine.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/EntityAutoEngine.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/EntityAutoEngine.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/EntityAutoEngine.java Sun Jul 5 10:01:19 2009 @@ -54,6 +54,7 @@ /** * @see org.ofbiz.service.engine.GenericEngine#runSyncIgnore(java.lang.String, org.ofbiz.service.ModelService, java.util.Map) */ + @Override public void runSyncIgnore(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException { runSync(localName, modelService, context); } @@ -61,6 +62,7 @@ /** * @see org.ofbiz.service.engine.GenericEngine#runSync(java.lang.String, org.ofbiz.service.ModelService, java.util.Map) */ + @Override public Map<String, Object> runSync(String localName, ModelService modelService, Map<String, Object> parameters) throws GenericServiceException { // static java service methods should be: public Map<String, Object> methodName(DispatchContext dctx, Map<String, Object> context) DispatchContext dctx = dispatcher.getLocalContext(localName); Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/GenericAsyncEngine.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/GenericAsyncEngine.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/GenericAsyncEngine.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/GenericAsyncEngine.java Sun Jul 5 10:01:19 2009 @@ -153,6 +153,7 @@ } } + @Override protected boolean allowCallbacks(ModelService model, Map<String, Object> context, int mode) throws GenericServiceException { return mode == GenericEngine.SYNC_MODE; } Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/GroovyEngine.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/GroovyEngine.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/GroovyEngine.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/GroovyEngine.java Sun Jul 5 10:01:19 2009 @@ -41,6 +41,7 @@ /** * @see org.ofbiz.service.engine.GenericEngine#runSyncIgnore(java.lang.String, org.ofbiz.service.ModelService, java.util.Map) */ + @Override public void runSyncIgnore(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException { runSync(localName, modelService, context); } @@ -48,6 +49,7 @@ /** * @see org.ofbiz.service.engine.GenericEngine#runSync(java.lang.String, org.ofbiz.service.ModelService, java.util.Map) */ + @Override public Map<String, Object> runSync(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException { return serviceInvoker(localName, modelService, context); } Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/HttpEngine.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/HttpEngine.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/HttpEngine.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/HttpEngine.java Sun Jul 5 10:01:19 2009 @@ -54,6 +54,7 @@ /** * @see org.ofbiz.service.engine.GenericEngine#runSync(java.lang.String, org.ofbiz.service.ModelService, java.util.Map) */ + @Override public Map<String, Object> runSync(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException { DispatchContext dctx = dispatcher.getLocalContext(localName); String xmlContext = null; @@ -95,6 +96,7 @@ /** * @see org.ofbiz.service.engine.GenericEngine#runSyncIgnore(java.lang.String, org.ofbiz.service.ModelService, java.util.Map) */ + @Override public void runSyncIgnore(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException { Map<String, Object> result = runSync(localName, modelService, context); } Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java Sun Jul 5 10:01:19 2009 @@ -59,6 +59,7 @@ /** * @see org.ofbiz.service.engine.GenericEngine#runSyncIgnore(java.lang.String, org.ofbiz.service.ModelService, java.util.Map) */ + @Override public void runSyncIgnore(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException { runSync(localName, modelService, context); } @@ -66,6 +67,7 @@ /** * @see org.ofbiz.service.engine.GenericEngine#runSync(java.lang.String, org.ofbiz.service.ModelService, java.util.Map) */ + @Override public Map<String, Object> runSync(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException { Map<String, Object> result = serviceInvoker(modelService, context); Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/StandardJavaEngine.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/StandardJavaEngine.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/StandardJavaEngine.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/StandardJavaEngine.java Sun Jul 5 10:01:19 2009 @@ -43,6 +43,7 @@ /** * @see org.ofbiz.service.engine.GenericEngine#runSyncIgnore(java.lang.String, org.ofbiz.service.ModelService, java.util.Map) */ + @Override public void runSyncIgnore(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException { Map result = runSync(localName, modelService, context); } @@ -50,6 +51,7 @@ /** * @see org.ofbiz.service.engine.GenericEngine#runSync(java.lang.String, org.ofbiz.service.ModelService, java.util.Map) */ + @Override public Map<String, Object> runSync(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException { Object result = serviceInvoker(localName, modelService, context); Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/group/GroupModel.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/group/GroupModel.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/group/GroupModel.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/group/GroupModel.java Sun Jul 5 10:01:19 2009 @@ -140,6 +140,7 @@ /** * @see java.lang.Object#toString() */ + @Override public String toString() { StringBuilder str = new StringBuilder(); str.append(getGroupName()); Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/group/GroupServiceModel.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/group/GroupServiceModel.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/group/GroupServiceModel.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/group/GroupServiceModel.java Sun Jul 5 10:01:19 2009 @@ -127,6 +127,7 @@ /** * @see java.lang.Object#toString() */ + @Override public String toString() { StringBuilder str = new StringBuilder(); str.append(getName()); Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/group/ServiceGroupEngine.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/group/ServiceGroupEngine.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/group/ServiceGroupEngine.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/group/ServiceGroupEngine.java Sun Jul 5 10:01:19 2009 @@ -41,6 +41,7 @@ /** * @see org.ofbiz.service.engine.GenericEngine#runSync(java.lang.String, org.ofbiz.service.ModelService, java.util.Map) */ + @Override public Map<String, Object> runSync(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException { GroupModel groupModel = modelService.internalGroup; if (groupModel == null) { @@ -56,6 +57,7 @@ /** * @see org.ofbiz.service.engine.GenericEngine#runSyncIgnore(java.lang.String, org.ofbiz.service.ModelService, java.util.Map) */ + @Override public void runSyncIgnore(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException { runSync(localName, modelService, context); } Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/job/GenericServiceJob.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/job/GenericServiceJob.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/job/GenericServiceJob.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/job/GenericServiceJob.java Sun Jul 5 10:01:19 2009 @@ -59,6 +59,7 @@ /** * Invokes the service. */ + @Override public void exec() throws InvalidJobException { init(); Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobManager.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobManager.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobManager.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobManager.java Sun Jul 5 10:01:19 2009 @@ -456,6 +456,7 @@ } } + @Override public void finalize() throws Throwable { this.shutdown(); super.finalize(); Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/job/PersistedServiceJob.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/job/PersistedServiceJob.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/job/PersistedServiceJob.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/job/PersistedServiceJob.java Sun Jul 5 10:01:19 2009 @@ -79,6 +79,7 @@ this.maxRetry = jobValue.get("maxRetry") != null ? jobValue.getLong("maxRetry").longValue() : -1; } + @Override public void queue() throws InvalidJobException { super.queue(); @@ -119,6 +120,7 @@ /** * @see org.ofbiz.service.job.GenericServiceJob#init() */ + @Override protected void init() throws InvalidJobException { super.init(); @@ -201,6 +203,7 @@ /** * @see org.ofbiz.service.job.GenericServiceJob#finish() */ + @Override protected void finish() throws InvalidJobException { super.finish(); @@ -221,6 +224,7 @@ /** * @see org.ofbiz.service.job.GenericServiceJob#failed(Throwable) */ + @Override protected void failed(Throwable t) throws InvalidJobException { super.failed(t); @@ -256,6 +260,7 @@ /** * @see org.ofbiz.service.job.GenericServiceJob#getServiceName() */ + @Override protected String getServiceName() throws InvalidJobException { GenericValue jobObj = getJob(); if (jobObj == null || jobObj.get("serviceName") == null) { @@ -267,6 +272,7 @@ /** * @see org.ofbiz.service.job.GenericServiceJob#getContext() */ + @Override protected Map<String, Object> getContext() throws InvalidJobException { Map<String, Object> context = null; try { Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java Sun Jul 5 10:01:19 2009 @@ -245,6 +245,7 @@ this.userLogin = userLogin; } + @Override public void run() { if (UtilValidate.isNotEmpty(stores)) { for (Map.Entry<Store, Session> entry: stores.entrySet()) { Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/rmi/RmiServiceEngine.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/rmi/RmiServiceEngine.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/rmi/RmiServiceEngine.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/rmi/RmiServiceEngine.java Sun Jul 5 10:01:19 2009 @@ -37,10 +37,12 @@ super(dispatcher); } + @Override public Map<String, Object> runSync(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException { return run(modelService, context); } + @Override public void runSyncIgnore(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException { run(modelService, context); } Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/rmi/socket/ssl/SSLServerSocketFactory.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/rmi/socket/ssl/SSLServerSocketFactory.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/rmi/socket/ssl/SSLServerSocketFactory.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/rmi/socket/ssl/SSLServerSocketFactory.java Sun Jul 5 10:01:19 2009 @@ -56,7 +56,6 @@ this.keystore = location; this.ksType = type; this.ksPass = password; - this.alias = alias; } public void setKeyStoreAlias(String alias) { Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/test/ServiceEngineTests.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/test/ServiceEngineTests.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/test/ServiceEngineTests.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/test/ServiceEngineTests.java Sun Jul 5 10:01:19 2009 @@ -30,9 +30,11 @@ super(name); } + @Override protected void setUp() throws Exception { } + @Override protected void tearDown() throws Exception { } Modified: ofbiz/trunk/framework/start/src/org/ofbiz/base/start/Classpath.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/start/src/org/ofbiz/base/start/Classpath.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/start/src/org/ofbiz/base/start/Classpath.java (original) +++ ofbiz/trunk/framework/start/src/org/ofbiz/base/start/Classpath.java Sun Jul 5 10:01:19 2009 @@ -89,6 +89,7 @@ } + @Override public String toString() { StringBuilder cp = new StringBuilder(1024); int cnt = _elements.size(); 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=791212&r1=791211&r2=791212&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 Sun Jul 5 10:01:19 2009 @@ -146,6 +146,7 @@ if (command.equals(Start.SHUTDOWN_COMMAND)) { if (serverStopping) return "IN-PROGRESS"; Thread t = new Thread() { + @Override public void run() { shutdownServer(); } @@ -281,6 +282,7 @@ try { Method shutdownHook = java.lang.Runtime.class.getMethod("addShutdownHook", new Class[]{java.lang.Thread.class}); Thread hook = new Thread() { + @Override public void run() { setName("OFBiz_Shutdown_Hook"); shutdownServer(); Modified: ofbiz/trunk/framework/start/src/org/ofbiz/base/start/StartupException.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/start/src/org/ofbiz/base/start/StartupException.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/start/src/org/ofbiz/base/start/StartupException.java (original) +++ ofbiz/trunk/framework/start/src/org/ofbiz/base/start/StartupException.java Sun Jul 5 10:01:19 2009 @@ -64,6 +64,7 @@ } /** Returns the detail message, including the message from the nested exception if there is one. */ + @Override public String getMessage() { if (nested != null) { return super.getMessage() + " (" + nested.getMessage() + ")"; @@ -86,6 +87,7 @@ } /** Prints the composite message to System.err. */ + @Override public void printStackTrace() { super.printStackTrace(); if (nested != null) { @@ -94,6 +96,7 @@ } /** Prints the composite message and the embedded stack trace to the specified stream ps. */ + @Override public void printStackTrace(PrintStream ps) { super.printStackTrace(ps); if (nested != null) { @@ -102,6 +105,7 @@ } /** Prints the composite message and the embedded stack trace to the specified print writer pw. */ + @Override public void printStackTrace(PrintWriter pw) { super.printStackTrace(pw); if (nested != null) { Modified: ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/EntityXmlAssertTest.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/EntityXmlAssertTest.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/EntityXmlAssertTest.java (original) +++ ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/EntityXmlAssertTest.java Sun Jul 5 10:01:19 2009 @@ -55,6 +55,7 @@ if (UtilValidate.isEmpty(this.action)) this.action = "assert"; } + @Override public int countTestCases() { int testCaseCount = 0; try { @@ -67,6 +68,7 @@ return testCaseCount; } + @Override public void run(TestResult result) { result.startTest(this); Modified: ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/JythonTest.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/JythonTest.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/JythonTest.java (original) +++ ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/JythonTest.java Sun Jul 5 10:01:19 2009 @@ -37,10 +37,12 @@ this.scriptLocation = mainElement.getAttribute("script-location"); } + @Override public int countTestCases() { return 1; } + @Override public void run(TestResult result) { // TODO Auto-generated method stub result.startTest(this); Modified: ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/ServiceTest.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/ServiceTest.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/ServiceTest.java (original) +++ ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/ServiceTest.java Sun Jul 5 10:01:19 2009 @@ -49,10 +49,12 @@ this.serviceName = mainElement.getAttribute("service-name"); } + @Override public int countTestCases() { return 1; } + @Override public void run(TestResult result) { result.startTest(this); Modified: ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/SimpleMethodTest.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/SimpleMethodTest.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/SimpleMethodTest.java (original) +++ ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/SimpleMethodTest.java Sun Jul 5 10:01:19 2009 @@ -52,10 +52,12 @@ this.methodName = mainElement.getAttribute("name"); } + @Override public int countTestCases() { return 1; } + @Override public void run(TestResult result) { result.startTest(this); Modified: ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java (original) +++ ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java Sun Jul 5 10:01:19 2009 @@ -190,11 +190,13 @@ this.setOutput(out); } + @Override public void startTestSuite(JUnitTest suite) { startTimes.put(suite.getName(), System.currentTimeMillis()); super.startTestSuite(suite); } + @Override public void endTestSuite(JUnitTest suite) throws BuildException { long startTime = startTimes.get(suite.getName()); suite.setRunTime((System.currentTimeMillis() - startTime)); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java Sun Jul 5 10:01:19 2009 @@ -279,7 +279,7 @@ for (File controllerFile: controllerFiles) { URL controllerUrl = null; try { - controllerUrl = controllerFile.toURL(); + controllerUrl = controllerFile.toURI().toURL(); } catch (MalformedURLException mue) { throw new GeneralException(mue); } Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java Sun Jul 5 10:01:19 2009 @@ -61,6 +61,7 @@ /** * @see javax.servlet.Servlet#init(javax.servlet.ServletConfig) */ + @Override public void init(ServletConfig config) throws ServletException { super.init(config); if (Debug.infoOn()) Debug.logInfo("LOADING WEBAPP [" + config.getServletContext().getContextPath().substring(1) + "] " + config.getServletContext().getServletContextName() + ", located at " + config.getServletContext().getRealPath("/"), module); @@ -74,6 +75,7 @@ /** * @see javax.servlet.http.HttpServlet#doPost(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) */ + @Override public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { doGet(request, response); } @@ -81,6 +83,7 @@ /** * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) */ + @Override public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { long requestStartTime = System.currentTimeMillis(); RequestHandler requestHandler = this.getRequestHandler(); @@ -316,6 +319,7 @@ /** * @see javax.servlet.Servlet#destroy() */ + @Override public void destroy() { super.destroy(); } Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONSimpleEventHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONSimpleEventHandler.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONSimpleEventHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONSimpleEventHandler.java Sun Jul 5 10:01:19 2009 @@ -25,6 +25,7 @@ public class JSONSimpleEventHandler extends AbstractJSONEventHandler{ + @Override public void init(ServletContext context) throws EventHandlerException { this.service = new SimpleEventHandler(); this.service.init(context); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/XmlRpcEventHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/XmlRpcEventHandler.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/XmlRpcEventHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/XmlRpcEventHandler.java Sun Jul 5 10:01:19 2009 @@ -135,6 +135,7 @@ return null; } + @Override protected void setResponseHeader(ServerStreamConnection con, String header, String value) { ((HttpStreamConnection) con).getResponse().setHeader(header, value); } @@ -205,6 +206,7 @@ this.setAuthenticationHandler(new OfbizRpcAuthHandler()); } + @Override public XmlRpcHandler getHandler(String method) throws XmlRpcNoSuchHandlerException, XmlRpcException { ModelService model = null; try { Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/LoopWriter.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/LoopWriter.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/LoopWriter.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/LoopWriter.java Sun Jul 5 10:01:19 2009 @@ -41,12 +41,15 @@ throw t; } + @Override public void close() throws IOException { } + @Override public void write(char cbuf[], int off, int len) { } + @Override public void flush() throws IOException { } Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizAmountTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizAmountTransform.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizAmountTransform.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizAmountTransform.java Sun Jul 5 10:01:19 2009 @@ -99,14 +99,17 @@ final String format = OfbizAmountTransform.getArg(args, "format"); return new Writer(out) { + @Override public void write(char cbuf[], int off, int len) { buf.append(cbuf, off, len); } + @Override public void flush() throws IOException { out.flush(); } + @Override public void close() throws IOException { try { if (Debug.verboseOn()) Debug.logVerbose("parms: " + amount + " " + format + " " + locale, module); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizContentTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizContentTransform.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizContentTransform.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizContentTransform.java Sun Jul 5 10:01:19 2009 @@ -24,10 +24,7 @@ import javax.servlet.http.HttpServletRequest; -import org.ofbiz.base.util.Debug; -import org.ofbiz.base.util.StringUtil; import org.ofbiz.webapp.taglib.ContentUrlTag; -import org.owasp.esapi.errors.EncodingException; import freemarker.core.Environment; import freemarker.ext.beans.BeanModel; @@ -44,14 +41,17 @@ public Writer getWriter(final Writer out, Map args) { final StringBuilder buf = new StringBuilder(); return new Writer(out) { + @Override public void write(char cbuf[], int off, int len) { 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/webapp/src/org/ofbiz/webapp/ftl/OfbizCurrencyTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizCurrencyTransform.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizCurrencyTransform.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizCurrencyTransform.java Sun Jul 5 10:01:19 2009 @@ -125,14 +125,17 @@ final int rounding = roundingNumber; return new Writer(out) { + @Override public void write(char cbuf[], int off, int len) { buf.append(cbuf, off, len); } + @Override public void flush() throws IOException { out.flush(); } + @Override public void close() throws IOException { try { if (Debug.verboseOn()) Debug.logVerbose("parms: " + amount + " " + isoCode + " " + locale, module); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizUrlTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizUrlTransform.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizUrlTransform.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizUrlTransform.java Sun Jul 5 10:01:19 2009 @@ -65,14 +65,17 @@ final boolean encode = checkArg(args, "encode", true); return new Writer(out) { + @Override public void write(char cbuf[], int off, int len) { 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/webapp/src/org/ofbiz/webapp/ftl/RenderWrappedTextTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/RenderWrappedTextTransform.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/RenderWrappedTextTransform.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/RenderWrappedTextTransform.java Sun Jul 5 10:01:19 2009 @@ -44,13 +44,16 @@ return new Writer(out) { + @Override public void write(char cbuf[], int off, int len) { } + @Override public void flush() throws IOException { out.flush(); } + @Override public void close() throws IOException { if (UtilValidate.isNotEmpty(wrappedFTL)) { out.write(wrappedFTL); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/Content.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/Content.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/Content.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/Content.java Sun Jul 5 10:01:19 2009 @@ -58,6 +58,7 @@ return type; } + @Override public String toString() { return "Content: " + content + ", type: " + type; } Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/Region.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/Region.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/Region.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/Region.java Sun Jul 5 10:01:19 2009 @@ -75,6 +75,7 @@ return sections; } + @Override public void render(PageContext pageContext) throws JspException { if (Debug.verboseOn()) Debug.logVerbose("Rendering " + this.toString(), module); @@ -98,6 +99,7 @@ } } + @Override public void render(HttpServletRequest request, HttpServletResponse response) throws java.io.IOException, ServletException { if (Debug.verboseOn()) Debug.logVerbose("Rendering " + this.toString(), module); @@ -114,6 +116,7 @@ rd.include(request, response); } + @Override public String toString() { String s = "Region: " + content + ", type=" + type; Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/RegionTag.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/RegionTag.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/RegionTag.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/RegionTag.java Sun Jul 5 10:01:19 2009 @@ -77,6 +77,7 @@ regionObj.put(section); } + @Override public void release() { super.release(); regionObj = null; Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/RenderTag.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/RenderTag.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/RenderTag.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/RenderTag.java Sun Jul 5 10:01:19 2009 @@ -59,6 +59,7 @@ return sectionName != null; } + @Override public int doStartTag() throws JspException { HttpServletRequest request = (HttpServletRequest) pageContext.getRequest(); @@ -75,6 +76,7 @@ return EVAL_BODY_INCLUDE; } + @Override public int doEndTag() throws JspException { Region regionEnd = null; @@ -107,6 +109,7 @@ return EVAL_PAGE; } + @Override public void release() { super.release(); sectionName = role = null; Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/Section.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/Section.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/Section.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/Section.java Sun Jul 5 10:01:19 2009 @@ -59,6 +59,7 @@ return name; } + @Override public void render(PageContext pageContext) throws JspException { try { if (UtilJ2eeCompat.doFlushOnRender(pageContext.getServletContext())) { @@ -82,6 +83,7 @@ } } + @Override public void render(HttpServletRequest request, HttpServletResponse response) throws java.io.IOException, ServletException { ServletContext context = (ServletContext) request.getAttribute("servletContext"); boolean verboseOn = Debug.verboseOn(); @@ -175,6 +177,7 @@ } */ + @Override public String toString() { return "Section: " + name + ", info=" + info + ", content=" + content + ", type=" + type; } Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/AbstractParameterTag.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/AbstractParameterTag.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/AbstractParameterTag.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/AbstractParameterTag.java Sun Jul 5 10:01:19 2009 @@ -58,11 +58,13 @@ return this.outParameters; } + @Override public int doStartTag() throws JspTagException { inParameters = FastMap.newInstance(); return EVAL_BODY_INCLUDE; } + @Override public abstract int doEndTag() throws JspTagException; } Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ContentUrlTag.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ContentUrlTag.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ContentUrlTag.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ContentUrlTag.java Sun Jul 5 10:01:19 2009 @@ -93,6 +93,7 @@ return buf.toString(); } + @Override public int doEndTag() throws JspException { HttpServletRequest request = (HttpServletRequest) pageContext.getRequest(); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/EntityFieldTag.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/EntityFieldTag.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/EntityFieldTag.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/EntityFieldTag.java Sun Jul 5 10:01:19 2009 @@ -89,6 +89,7 @@ this.defaultObj = defaultObj; } + @Override public int doStartTag() throws JspException { try { EntityField.run(attribute, field, prefix, suffix, defaultObj.toString(), type, pageContext); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/FormatTag.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/FormatTag.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/FormatTag.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/FormatTag.java Sun Jul 5 10:01:19 2009 @@ -53,6 +53,7 @@ this.defaultStr = defaultStr; } + @Override public int doAfterBody() throws JspException { NumberFormat nf = null; DateFormat df = null; Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/I18nBundleTag.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/I18nBundleTag.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/I18nBundleTag.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/I18nBundleTag.java Sun Jul 5 10:01:19 2009 @@ -56,6 +56,7 @@ return this.bundle; } + @Override public int doStartTag() throws JspException { try { this.bundle = UtilProperties.getResourceBundle(this.baseName, UtilHttp.getLocale((HttpServletRequest) pageContext.getRequest())); @@ -75,6 +76,7 @@ return EVAL_BODY_INCLUDE; } + @Override public int doEndTag() throws JspException { return EVAL_PAGE; } Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/I18nMessageTag.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/I18nMessageTag.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/I18nMessageTag.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/I18nMessageTag.java Sun Jul 5 10:01:19 2009 @@ -70,6 +70,7 @@ this.arguments.add(argument); } + @Override public int doStartTag() throws JspException { try { if (this.bundle == null) { @@ -97,6 +98,7 @@ return EVAL_BODY_AGAIN; } + @Override public int doEndTag() throws JspException { try { if (this.value != null && UtilValidate.isNotEmpty(this.arguments)) { Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IfTag.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IfTag.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IfTag.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IfTag.java Sun Jul 5 10:01:19 2009 @@ -74,6 +74,7 @@ return size.toString(); } + @Override public int doStartTag() throws JspTagException { Object object = null; @@ -220,10 +221,12 @@ return SKIP_BODY; } + @Override public int doAfterBody() { return SKIP_BODY; } + @Override public int doEndTag() { try { BodyContent body = getBodyContent(); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/InputValueTag.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/InputValueTag.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/InputValueTag.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/InputValueTag.java Sun Jul 5 10:01:19 2009 @@ -91,6 +91,7 @@ this.fullattrsStr = fullattrsStr; } + @Override public int doStartTag() throws JspException { try { InputValue.run(field, param, entityAttr, tryEntityAttr, defaultStr, fullattrsStr, pageContext); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IterateNextTEI.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IterateNextTEI.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IterateNextTEI.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IterateNextTEI.java Sun Jul 5 10:01:19 2009 @@ -28,6 +28,7 @@ super(); } + @Override public VariableInfo[] getVariableInfo(TagData data) { String name = null; String className = null; @@ -47,6 +48,7 @@ return result; } + @Override public boolean isValid(TagData data) { return true; } Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IterateNextTag.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IterateNextTag.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IterateNextTag.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IterateNextTag.java Sun Jul 5 10:01:19 2009 @@ -62,6 +62,7 @@ return element; } + @Override public int doStartTag() throws JspTagException { IteratorTag iteratorTag = (IteratorTag) findAncestorWithClass(this, IteratorTag.class); @@ -102,10 +103,12 @@ return EVAL_BODY_AGAIN; } + @Override public int doAfterBody() { return SKIP_BODY; } + @Override public int doEndTag() { try { BodyContent body = getBodyContent(); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IteratorHasNextTag.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IteratorHasNextTag.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IteratorHasNextTag.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IteratorHasNextTag.java Sun Jul 5 10:01:19 2009 @@ -31,6 +31,7 @@ */ public class IteratorHasNextTag extends BodyTagSupport { + @Override public int doStartTag() throws JspTagException { IteratorTag iteratorTag = (IteratorTag) findAncestorWithClass(this, IteratorTag.class); @@ -46,10 +47,12 @@ return EVAL_BODY_AGAIN; } + @Override public int doAfterBody() { return SKIP_BODY; } + @Override public int doEndTag() { try { BodyContent body = getBodyContent(); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IteratorTEI.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IteratorTEI.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IteratorTEI.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IteratorTEI.java Sun Jul 5 10:01:19 2009 @@ -31,6 +31,7 @@ super(); } + @Override public VariableInfo[] getVariableInfo(TagData data) { String name = null; String className = null; @@ -47,6 +48,7 @@ return result; } + @Override public boolean isValid(TagData data) { return true; } Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IteratorTag.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IteratorTag.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IteratorTag.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IteratorTag.java Sun Jul 5 10:01:19 2009 @@ -112,6 +112,7 @@ return expandMap ? "true" : "false"; } + @Override public int doStartTag() throws JspTagException { Debug.logVerbose("Starting Iterator Tag...", module); @@ -126,6 +127,7 @@ return SKIP_BODY; } + @Override public int doAfterBody() { if (defineElement()) { return EVAL_BODY_AGAIN; @@ -134,6 +136,7 @@ } } + @Override public int doEndTag() { try { BodyContent body = getBodyContent(); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ObjectTEI.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ObjectTEI.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ObjectTEI.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ObjectTEI.java Sun Jul 5 10:01:19 2009 @@ -31,6 +31,7 @@ super(); } + @Override public VariableInfo[] getVariableInfo(TagData data) { String name = null; String className = null; @@ -47,6 +48,7 @@ return result; } + @Override public boolean isValid(TagData data) { return true; } Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ObjectTag.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ObjectTag.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ObjectTag.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ObjectTag.java Sun Jul 5 10:01:19 2009 @@ -65,6 +65,7 @@ return type.getName(); } + @Override public int doStartTag() throws JspTagException { String realAttrName = property; @@ -80,6 +81,7 @@ return EVAL_BODY_INCLUDE; } + @Override public int doEndTag() { return EVAL_PAGE; } Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ParamTag.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ParamTag.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ParamTag.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ParamTag.java Sun Jul 5 10:01:19 2009 @@ -82,6 +82,7 @@ return this.alias; } + @Override public int doStartTag() throws JspTagException { AbstractParameterTag sTag = (AbstractParameterTag) findAncestorWithClass(this, AbstractParameterTag.class); @@ -122,6 +123,7 @@ return SKIP_BODY; } + @Override public int doEndTag() { return EVAL_PAGE; } Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/PrintTag.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/PrintTag.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/PrintTag.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/PrintTag.java Sun Jul 5 10:01:19 2009 @@ -52,6 +52,7 @@ this.defaultStr = defaultStr; } + @Override public int doStartTag() throws JspException { if (attribute == null) return SKIP_BODY; Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ServiceTag.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ServiceTag.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ServiceTag.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ServiceTag.java Sun Jul 5 10:01:19 2009 @@ -63,6 +63,7 @@ return resultScope; } + @Override public int doEndTag() throws JspTagException { LocalDispatcher dispatcher = (LocalDispatcher) pageContext.getRequest().getAttribute("dispatcher"); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/UnlessTag.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/UnlessTag.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/UnlessTag.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/UnlessTag.java Sun Jul 5 10:01:19 2009 @@ -25,6 +25,7 @@ */ public class UnlessTag extends IfTag { + @Override public int doStartTag() throws JspTagException { // do the opposite of what IfTag does. EVAL_BODY_AGAIN -> SKIP_BODY, vice-versa return (EVAL_BODY_AGAIN + SKIP_BODY) - super.doStartTag(); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/UrlTag.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/UrlTag.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/UrlTag.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/UrlTag.java Sun Jul 5 10:01:19 2009 @@ -37,6 +37,7 @@ public static final String module = UrlTag.class.getName(); + @Override public int doEndTag() throws JspException { HttpServletRequest request = (HttpServletRequest) pageContext.getRequest(); HttpServletResponse response = (HttpServletResponse) pageContext.getResponse(); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopFactory.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopFactory.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopFactory.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopFactory.java Sun Jul 5 10:01:19 2009 @@ -33,6 +33,7 @@ public static final String module = ApacheFopFactory.class.getName(); /** @deprecated use ApacheFopWorker.getFactoryInstance() */ + @Deprecated public static FopFactory instance() { return ApacheFopWorker.getFactoryInstance(); } Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/WebDavServlet.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/WebDavServlet.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/WebDavServlet.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/WebDavServlet.java Sun Jul 5 10:01:19 2009 @@ -91,6 +91,7 @@ } } + @Override public void service(ServletRequest request, ServletResponse response) throws ServletException, IOException { request.setAttribute("delegator", this.delegator); request.setAttribute("dispatcher", this.dispatcher); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |