You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2008/06/26 15:41:00 UTC
svn commit: r671896 - in /ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos:
component/Operator.java component/PosButtonWrapper.java
event/ManagerEvents.java screen/PosScreen.java
Author: jleroux
Date: Thu Jun 26 06:40:59 2008
New Revision: 671896
URL: http://svn.apache.org/viewvc?rev=671896&view=rev
Log:
Fix a couple of XUI deprecated warnings
Modified:
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Operator.java
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/PosButtonWrapper.java
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PosScreen.java
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Operator.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Operator.java?rev=671896&r1=671895&r2=671896&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Operator.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Operator.java Thu Jun 26 06:40:59 2008
@@ -58,7 +58,7 @@
public Operator(PosScreen page) {
- this.titleStyle = XProjectManager.getStyleManager().getStyle(style);
+ this.titleStyle = XProjectManager.getCurrentProject().getStyleManager().getStyle(style);
this.operPanel = (XPanel) page.findComponent("oper_panel");
this.operatorField = operPanel.getComponents();
this.operPanel.setVisible(false);
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/PosButtonWrapper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/PosButtonWrapper.java?rev=671896&r1=671895&r2=671896&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/PosButtonWrapper.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/PosButtonWrapper.java Thu Jun 26 06:40:59 2008
@@ -53,19 +53,19 @@
this.origText = xbutton.getText();
// load the disabled style
- this.disabledStyle = XProjectManager.getStyleManager().getStyle(disabledAll);
+ this.disabledStyle = XProjectManager.getCurrentProject().getStyleManager().getStyle(disabledAll);
if (this.disabledStyle == null) {
Debug.logError("ERROR: The disabled button style \"buttonDisabled\" was not found!", module);
}
// load the enabled style
if (styleName != null) {
- this.enabledStyle = XProjectManager.getStyleManager().getStyle(styleName);
+ this.enabledStyle = XProjectManager.getCurrentProject().getStyleManager().getStyle(styleName);
if (this.enabledStyle == null) {
Debug.logError("ERROR: The enabled button style \""+ styleName + "\" was not found!", module);
}
} else {
- this.enabledStyle = XProjectManager.getStyleManager().getStyle(enabledMenu);
+ this.enabledStyle = XProjectManager.getCurrentProject().getStyleManager().getStyle(enabledMenu);
if (this.enabledStyle == null) {
Debug.logError("ERROR: The enabled button style \""+ enabledMenu + "\" was not found!", module);
}
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java?rev=671896&r1=671895&r2=671896&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java Thu Jun 26 06:40:59 2008
@@ -39,7 +39,7 @@
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.condition.EntityCondition;
-import org.ofbiz.entity.condition.EntityConditionList;
+import org.ofbiz.entity.condition.EntityExpr;
import org.ofbiz.entity.condition.EntityOperator;
import org.ofbiz.entity.util.EntityListIterator;
import org.ofbiz.guiapp.xui.XuiSession;
@@ -312,7 +312,7 @@
Timestamp orderDate = orderHeader.getTimestamp("orderDate");
if (orderDate.after(openDate)) {
LocalDispatcher dispatcher = session.getDispatcher();
- Map returnResp = null;
+ Map<String, Object> returnResp = null;
try {
returnResp = dispatcher.runSync("quickReturnOrder", UtilMisc.<String, Object>toMap("orderId", orderId,
"returnHeaderTypeId", "CUSTOMER_RETURN", "userLogin", session.getUserLogin()));
@@ -378,7 +378,7 @@
if (!mgrLoggedIn) {
pos.showDialog("dialog/error/mgrnotloggedin");
} else {
- XProjectManager.getPageManager().reset();
+ XProjectManager.getCurrentProject().getPageManager().reset();
pos.refresh();
}
}
@@ -475,7 +475,7 @@
double total = 0.00;
GenericDelegator delegator = pos.getSession().getDelegator();
- List exprs = UtilMisc.toList(EntityCondition.makeCondition("originFacilityId", EntityOperator.EQUALS, trans.getFacilityId()),
+ List<EntityExpr> exprs = UtilMisc.toList(EntityCondition.makeCondition("originFacilityId", EntityOperator.EQUALS, trans.getFacilityId()),
EntityCondition.makeCondition("terminalId", EntityOperator.EQUALS, trans.getTerminalId()));
EntityListIterator eli = null;
@@ -521,7 +521,7 @@
}
}
- Map reportMap = new HashMap();
+ Map<String, String> reportMap = new HashMap<String, String>();
String reportTemplate = "totals.txt";
// miscellaneous
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PosScreen.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PosScreen.java?rev=671896&r1=671895&r2=671896&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PosScreen.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PosScreen.java Thu Jun 26 06:40:59 2008
@@ -27,7 +27,6 @@
import java.util.*;
-import net.xoetrope.builder.NavigationHelper;
import net.xoetrope.xui.XPage;
import net.xoetrope.xui.XProject;
import net.xoetrope.xui.XProjectManager;
@@ -47,7 +46,7 @@
import org.ofbiz.pos.component.PosButton;
import org.ofbiz.pos.device.DeviceLoader;
-public class PosScreen extends NavigationHelper implements Runnable, DialogCallback, FocusListener {
+public class PosScreen extends XPage implements Runnable, DialogCallback, FocusListener {
public static final String module = PosScreen.class.getName();
public static final Frame appFrame = XProjectManager.getCurrentProject().getAppFrame();