You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ch...@apache.org on 2008/03/06 12:30:08 UTC

svn commit: r634223 - in /ofbiz/trunk/specialpurpose/pos: screens/default/dialog/error/nosales.xml screens/default/dialog/loadsale.xml screens/default/dialog/savesale.xml src/org/ofbiz/pos/screen/LoadSale.java src/org/ofbiz/pos/screen/SaveSale.java

Author: chrisg
Date: Thu Mar  6 03:30:01 2008
New Revision: 634223

URL: http://svn.apache.org/viewvc?rev=634223&view=rev
Log:
Setting svn properties (svn:eol-style,svn:mime-type,svn:keywords)

Modified:
    ofbiz/trunk/specialpurpose/pos/screens/default/dialog/error/nosales.xml   (props changed)
    ofbiz/trunk/specialpurpose/pos/screens/default/dialog/loadsale.xml   (props changed)
    ofbiz/trunk/specialpurpose/pos/screens/default/dialog/savesale.xml   (props changed)
    ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/LoadSale.java   (contents, props changed)
    ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/SaveSale.java   (contents, props changed)

Propchange: ofbiz/trunk/specialpurpose/pos/screens/default/dialog/error/nosales.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/pos/screens/default/dialog/error/nosales.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar  6 03:30:01 2008
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/pos/screens/default/dialog/loadsale.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/pos/screens/default/dialog/loadsale.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar  6 03:30:01 2008
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/pos/screens/default/dialog/savesale.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/pos/screens/default/dialog/savesale.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar  6 03:30:01 2008
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/LoadSale.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/LoadSale.java?rev=634223&r1=634222&r2=634223&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/LoadSale.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/LoadSale.java Thu Mar  6 03:30:01 2008
@@ -1,245 +1,245 @@
-/*******************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *******************************************************************************/
-package org.ofbiz.pos.screen;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Map;
-
-import javax.swing.DefaultListModel;
-import javax.swing.ListSelectionModel;
-
-import net.xoetrope.swing.XButton;
-import net.xoetrope.swing.XDialog;
-import net.xoetrope.swing.XList;
-import net.xoetrope.xui.XPage;
-import net.xoetrope.xui.events.XEventHelper;
-
-import org.ofbiz.base.util.Debug;
-import org.ofbiz.base.util.UtilProperties;
-import org.ofbiz.pos.PosTransaction;
-
-
-public class LoadSale extends XPage {
-
-    /**
-     * To load a sale from a shopping list. 2 modes : add to or replace the current sale. Also a button to delete a sale (aka shopping list) 
-     */
-    public static final String module = LoadSale.class.getName();
-    protected static PosScreen m_pos = null;
-    protected XDialog m_dialog = null;
-    static protected Hashtable m_saleMap = new Hashtable();
-    protected XList m_salesList = null;
-    protected XButton m_cancel = null;
-    protected XButton m_add = null;
-    protected XButton m_replace = null;
-    protected XButton m_delete = null;
-    protected XButton m_replaceAndDelete = null;
-    protected DefaultListModel m_listModel = null; 
-    protected static PosTransaction m_trans = null;
-
-    //TODO : make getter and setter for members (ie m_*) if needed (extern calls). For that in Eclipse use Source/Generate Getters and setters
-
-    public LoadSale(Hashtable saleMap, PosTransaction trans, PosScreen page) {
-        m_saleMap.putAll(saleMap);
-        m_trans = trans;
-        m_pos = page;
-    }
-
-    public void openDlg() {
-        m_dialog = (XDialog) pageMgr.loadPage(m_pos.getScreenLocation() + "/dialog/loadsale");
-        m_dialog.setCaption(UtilProperties.getMessage("pos", "LoadASale", Locale.getDefault()));
-        m_salesList = (XList) m_dialog.findComponent("salesList");
-        XEventHelper.addMouseHandler(this, m_salesList, "saleDoubleClick");
-
-        m_cancel = (XButton) m_dialog.findComponent("BtnCancel");
-        m_add = (XButton) m_dialog.findComponent("BtnAdd");
-        m_replace = (XButton) m_dialog.findComponent("BtnReplace");
-        m_delete = (XButton) m_dialog.findComponent("BtnDelete");
-        m_replaceAndDelete = (XButton) m_dialog.findComponent("BtnReplaceAndDelete");
-        XEventHelper.addMouseHandler(this, m_cancel, "cancel");
-        XEventHelper.addMouseHandler(this, m_replace, "replaceSale");
-        XEventHelper.addMouseHandler(this, m_add, "addSale");
-        XEventHelper.addMouseHandler(this, m_delete, "deleteShoppingList");
-        XEventHelper.addMouseHandler(this, m_replaceAndDelete, "replaceSaleAndDeleteShoppingList");
-
-        m_listModel = new DefaultListModel();
-        for (Iterator i = m_saleMap.entrySet().iterator(); i.hasNext();) {
-            Object o = i.next();
-            Map.Entry entry = (Map.Entry)o;
-            String val = entry.getValue().toString();
-            m_listModel.addElement(val);
-        }
-        m_salesList.setModel(m_listModel);
-        m_salesList.setVisibleRowCount(-1);
-        m_salesList.ensureIndexIsVisible(m_salesList.getItemCount());     
-        m_salesList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-        m_salesList.setToolTipText(UtilProperties.getMessage("pos", "LoadSaleListDblClickTip", Locale.getDefault()));
-
-        m_dialog.pack();
-        m_salesList.requestFocusInWindow();
-        m_dialog.showDialog(this);
-    }
-
-    public synchronized void saleDoubleClick() {
-        if (wasMouseDoubleClicked()) {
-            String sale = selectedSale();
-            if (null != sale) {
-                replaceSaleAndDeleteShoppingList_();
-            }
-        }
-    }
-
-    public synchronized void cancel() {
-        if (wasMouseClicked()) {
-            closeDlg();
-        }
-    }
-
-    public synchronized void addSale() {
-        if (wasMouseClicked()) {
-            addSale_();
-        }
-    }
-
-    private synchronized void addSale_() {
-        String sale = selectedSale();
-        if (null != sale) {
-            addListToCart(sale, true);
-        }
-    }
-
-    public synchronized void replaceSale() {
-        if (wasMouseClicked()) {
-            replaceSale_();
-        }
-    }
-
-    private synchronized void replaceSale_() {
-        String sale = selectedSale();
-        if (null != sale) {
-            addListToCart(sale, false);
-        }
-    }
-
-    public synchronized void deleteShoppingList() {
-        if (wasMouseClicked()) {
-            deleteShoppingList_();
-        }
-    }
-
-    private synchronized void deleteShoppingList_() {
-        String sale= (String) m_salesList.getSelectedValue();
-        if (null != sale) {
-            String shoppingListId = selectedSale();
-            final ClassLoader cl = this.getClassLoader(m_pos);
-            Thread.currentThread().setContextClassLoader(cl);
-            if (m_trans.clearList(shoppingListId, m_pos)) {
-                int index = m_salesList.getSelectedIndex();
-                m_saleMap.remove(shoppingListId);
-                m_listModel = new DefaultListModel();
-                for (Iterator i = m_saleMap.entrySet().iterator(); i.hasNext();) {
-                    Object o = i.next();
-                    Map.Entry entry = (Map.Entry)o;
-                    String val = entry.getValue().toString();
-                    m_listModel.addElement(val);
-                }
-                m_salesList.setModel(m_listModel);
-                int size = m_listModel.getSize();
-                if (size == 0) { //Nobody's left, nothing to do here
-                    closeDlg();
-                } else { //Select an index.
-                    if (index == size) {
-                        //removed item in last position
-                        index--;
-                    }
-                }
-                m_salesList.setSelectedIndex(index);
-                m_salesList.ensureIndexIsVisible(index);
-                m_salesList.repaint();
-                repaint();
-            }
-        }
-    }
-
-    public synchronized void replaceSaleAndDeleteShoppingList() {
-        if (wasMouseClicked()) {
-            replaceSaleAndDeleteShoppingList_();
-        }
-    }
-
-    public synchronized void replaceSaleAndDeleteShoppingList_() {
-        replaceSale_();
-        deleteShoppingList_();
-    }
-
-    private String selectedSale() {
-        String saleSelected = null;
-        if (null != m_salesList.getSelectedValue()) {
-            String sale = (String) m_salesList.getSelectedValue();
-            Iterator i = m_saleMap.entrySet().iterator();
-            while(i.hasNext()) {
-                Object o = i.next();
-                Map.Entry entry = (Map.Entry)o;
-                String val = entry.getValue().toString();
-                if (val.equals(sale)) {
-                    saleSelected = entry.getKey().toString();
-                }
-            }
-        }
-        return saleSelected;
-    }
-
-    private void addListToCart(String sale, boolean addToCart) {
-        final ClassLoader cl = this.getClassLoader(m_pos);
-        Thread.currentThread().setContextClassLoader(cl);
-        if (!m_trans.addListToCart(sale, m_pos, addToCart)) {
-            Debug.logError("Error while loading cart from shopping list : " + sale, module);
-        } 
-        else {
-            m_trans.calcTax();
-            m_pos.refresh();
-        }   
-        closeDlg();
-    }
-
-    private ClassLoader getClassLoader(PosScreen pos) {
-        ClassLoader cl = pos.getClassLoader();
-        if (cl == null) {
-            try {
-                cl = Thread.currentThread().getContextClassLoader();
-            } catch (Throwable t) {
-            }
-            if (cl == null) {
-                Debug.log("No context classloader available; using class classloader", module);
-                try {
-                    cl = this.getClass().getClassLoader();
-                } catch (Throwable t) {
-                    Debug.logError(t, module);
-                }
-            }
-        }
-        return cl;
-    }    
-
-    private void closeDlg() {
-        m_dialog.closeDlg();
-    }
+/*******************************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *******************************************************************************/
+package org.ofbiz.pos.screen;
+
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.swing.DefaultListModel;
+import javax.swing.ListSelectionModel;
+
+import net.xoetrope.swing.XButton;
+import net.xoetrope.swing.XDialog;
+import net.xoetrope.swing.XList;
+import net.xoetrope.xui.XPage;
+import net.xoetrope.xui.events.XEventHelper;
+
+import org.ofbiz.base.util.Debug;
+import org.ofbiz.base.util.UtilProperties;
+import org.ofbiz.pos.PosTransaction;
+
+
+public class LoadSale extends XPage {
+
+    /**
+     * To load a sale from a shopping list. 2 modes : add to or replace the current sale. Also a button to delete a sale (aka shopping list) 
+     */
+    public static final String module = LoadSale.class.getName();
+    protected static PosScreen m_pos = null;
+    protected XDialog m_dialog = null;
+    static protected Hashtable m_saleMap = new Hashtable();
+    protected XList m_salesList = null;
+    protected XButton m_cancel = null;
+    protected XButton m_add = null;
+    protected XButton m_replace = null;
+    protected XButton m_delete = null;
+    protected XButton m_replaceAndDelete = null;
+    protected DefaultListModel m_listModel = null; 
+    protected static PosTransaction m_trans = null;
+
+    //TODO : make getter and setter for members (ie m_*) if needed (extern calls). For that in Eclipse use Source/Generate Getters and setters
+
+    public LoadSale(Hashtable saleMap, PosTransaction trans, PosScreen page) {
+        m_saleMap.putAll(saleMap);
+        m_trans = trans;
+        m_pos = page;
+    }
+
+    public void openDlg() {
+        m_dialog = (XDialog) pageMgr.loadPage(m_pos.getScreenLocation() + "/dialog/loadsale");
+        m_dialog.setCaption(UtilProperties.getMessage("pos", "LoadASale", Locale.getDefault()));
+        m_salesList = (XList) m_dialog.findComponent("salesList");
+        XEventHelper.addMouseHandler(this, m_salesList, "saleDoubleClick");
+
+        m_cancel = (XButton) m_dialog.findComponent("BtnCancel");
+        m_add = (XButton) m_dialog.findComponent("BtnAdd");
+        m_replace = (XButton) m_dialog.findComponent("BtnReplace");
+        m_delete = (XButton) m_dialog.findComponent("BtnDelete");
+        m_replaceAndDelete = (XButton) m_dialog.findComponent("BtnReplaceAndDelete");
+        XEventHelper.addMouseHandler(this, m_cancel, "cancel");
+        XEventHelper.addMouseHandler(this, m_replace, "replaceSale");
+        XEventHelper.addMouseHandler(this, m_add, "addSale");
+        XEventHelper.addMouseHandler(this, m_delete, "deleteShoppingList");
+        XEventHelper.addMouseHandler(this, m_replaceAndDelete, "replaceSaleAndDeleteShoppingList");
+
+        m_listModel = new DefaultListModel();
+        for (Iterator i = m_saleMap.entrySet().iterator(); i.hasNext();) {
+            Object o = i.next();
+            Map.Entry entry = (Map.Entry)o;
+            String val = entry.getValue().toString();
+            m_listModel.addElement(val);
+        }
+        m_salesList.setModel(m_listModel);
+        m_salesList.setVisibleRowCount(-1);
+        m_salesList.ensureIndexIsVisible(m_salesList.getItemCount());     
+        m_salesList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+        m_salesList.setToolTipText(UtilProperties.getMessage("pos", "LoadSaleListDblClickTip", Locale.getDefault()));
+
+        m_dialog.pack();
+        m_salesList.requestFocusInWindow();
+        m_dialog.showDialog(this);
+    }
+
+    public synchronized void saleDoubleClick() {
+        if (wasMouseDoubleClicked()) {
+            String sale = selectedSale();
+            if (null != sale) {
+                replaceSaleAndDeleteShoppingList_();
+            }
+        }
+    }
+
+    public synchronized void cancel() {
+        if (wasMouseClicked()) {
+            closeDlg();
+        }
+    }
+
+    public synchronized void addSale() {
+        if (wasMouseClicked()) {
+            addSale_();
+        }
+    }
+
+    private synchronized void addSale_() {
+        String sale = selectedSale();
+        if (null != sale) {
+            addListToCart(sale, true);
+        }
+    }
+
+    public synchronized void replaceSale() {
+        if (wasMouseClicked()) {
+            replaceSale_();
+        }
+    }
+
+    private synchronized void replaceSale_() {
+        String sale = selectedSale();
+        if (null != sale) {
+            addListToCart(sale, false);
+        }
+    }
+
+    public synchronized void deleteShoppingList() {
+        if (wasMouseClicked()) {
+            deleteShoppingList_();
+        }
+    }
+
+    private synchronized void deleteShoppingList_() {
+        String sale= (String) m_salesList.getSelectedValue();
+        if (null != sale) {
+            String shoppingListId = selectedSale();
+            final ClassLoader cl = this.getClassLoader(m_pos);
+            Thread.currentThread().setContextClassLoader(cl);
+            if (m_trans.clearList(shoppingListId, m_pos)) {
+                int index = m_salesList.getSelectedIndex();
+                m_saleMap.remove(shoppingListId);
+                m_listModel = new DefaultListModel();
+                for (Iterator i = m_saleMap.entrySet().iterator(); i.hasNext();) {
+                    Object o = i.next();
+                    Map.Entry entry = (Map.Entry)o;
+                    String val = entry.getValue().toString();
+                    m_listModel.addElement(val);
+                }
+                m_salesList.setModel(m_listModel);
+                int size = m_listModel.getSize();
+                if (size == 0) { //Nobody's left, nothing to do here
+                    closeDlg();
+                } else { //Select an index.
+                    if (index == size) {
+                        //removed item in last position
+                        index--;
+                    }
+                }
+                m_salesList.setSelectedIndex(index);
+                m_salesList.ensureIndexIsVisible(index);
+                m_salesList.repaint();
+                repaint();
+            }
+        }
+    }
+
+    public synchronized void replaceSaleAndDeleteShoppingList() {
+        if (wasMouseClicked()) {
+            replaceSaleAndDeleteShoppingList_();
+        }
+    }
+
+    public synchronized void replaceSaleAndDeleteShoppingList_() {
+        replaceSale_();
+        deleteShoppingList_();
+    }
+
+    private String selectedSale() {
+        String saleSelected = null;
+        if (null != m_salesList.getSelectedValue()) {
+            String sale = (String) m_salesList.getSelectedValue();
+            Iterator i = m_saleMap.entrySet().iterator();
+            while(i.hasNext()) {
+                Object o = i.next();
+                Map.Entry entry = (Map.Entry)o;
+                String val = entry.getValue().toString();
+                if (val.equals(sale)) {
+                    saleSelected = entry.getKey().toString();
+                }
+            }
+        }
+        return saleSelected;
+    }
+
+    private void addListToCart(String sale, boolean addToCart) {
+        final ClassLoader cl = this.getClassLoader(m_pos);
+        Thread.currentThread().setContextClassLoader(cl);
+        if (!m_trans.addListToCart(sale, m_pos, addToCart)) {
+            Debug.logError("Error while loading cart from shopping list : " + sale, module);
+        } 
+        else {
+            m_trans.calcTax();
+            m_pos.refresh();
+        }   
+        closeDlg();
+    }
+
+    private ClassLoader getClassLoader(PosScreen pos) {
+        ClassLoader cl = pos.getClassLoader();
+        if (cl == null) {
+            try {
+                cl = Thread.currentThread().getContextClassLoader();
+            } catch (Throwable t) {
+            }
+            if (cl == null) {
+                Debug.log("No context classloader available; using class classloader", module);
+                try {
+                    cl = this.getClass().getClassLoader();
+                } catch (Throwable t) {
+                    Debug.logError(t, module);
+                }
+            }
+        }
+        return cl;
+    }    
+
+    private void closeDlg() {
+        m_dialog.closeDlg();
+    }
 }

Propchange: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/LoadSale.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/LoadSale.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar  6 03:30:01 2008
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/SaveSale.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/SaveSale.java?rev=634223&r1=634222&r2=634223&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/SaveSale.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/SaveSale.java Thu Mar  6 03:30:01 2008
@@ -1,131 +1,131 @@
-/*******************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *******************************************************************************/
-package org.ofbiz.pos.screen;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-
-import net.xoetrope.swing.XButton;
-//import org.ofbiz.pos.screen.XFocusDialog;
-import net.xoetrope.swing.XEdit;
-import net.xoetrope.swing.XDialog;
-import net.xoetrope.xui.XPage;
-import net.xoetrope.xui.events.XEventHelper;
-
-import org.ofbiz.base.util.Debug;
-import org.ofbiz.base.util.UtilProperties;
-import org.ofbiz.pos.PosTransaction;
-
-
-public class SaveSale extends XPage {
-
-    /**
-     * To save a sale. 2 modes : save and keep the current sale or save and clear the current sale.  
-     */
-    public static final String module = SaveSale.class.getName();
-    protected static PosScreen m_pos = null;
-    protected XDialog m_dialog = null;
-    protected XEdit m_saleName = null;
-    protected XButton m_cancel = null;
-    protected XButton m_save = null;
-    protected XButton m_saveAndClear = null;
-    protected static PosTransaction m_trans = null;
-    public static SimpleDateFormat sdf = new SimpleDateFormat(UtilProperties.getMessage("pos","DateTimeFormat",Locale.getDefault()));
-
-    //TODO : make getter and setter for members (ie m_*) if needed (extern calls).  For that in Eclipse use Source/Generate Getters and setters
-
-    public SaveSale(PosTransaction trans, PosScreen page) {
-        m_trans = trans;
-        m_pos = page;
-    }
-
-    public void openDlg() {
-        m_dialog = (XDialog) pageMgr.loadPage(m_pos.getScreenLocation() + "/dialog/savesale");
-        m_saleName = (XEdit) m_dialog.findComponent("saleName");        
-        //m_dialog.setM_focused(m_saleName); 
-        m_saleName.setText(m_pos.session.getUserId() + " " + sdf.format(new Date()));
-        m_dialog.setCaption(UtilProperties.getMessage("pos", "SaveASale", Locale.getDefault()));
-
-        m_cancel = (XButton) m_dialog.findComponent("BtnCancel");
-        m_save = (XButton) m_dialog.findComponent("BtnSave");
-        m_saveAndClear = (XButton) m_dialog.findComponent("BtnSaveAndClear");
-
-        
-        XEventHelper.addMouseHandler(this, m_cancel, "cancel");
-        XEventHelper.addMouseHandler(this, m_save, "save");
-        XEventHelper.addMouseHandler(this, m_saveAndClear, "saveAndClear");
-
-        m_dialog.pack();
-        m_dialog.showDialog(this);
-    }
-
-    public synchronized void cancel()
-    {
-        if (wasMouseClicked()) {
-            this.m_dialog.closeDlg();
-        }
-    }
-
-    public synchronized void save() {
-        if (wasMouseClicked()) {
-            String sale = m_saleName.getText();
-            if (null != sale) {
-                saveSale(sale);
-            }
-        }
-    }
-
-    public synchronized void saveAndClear() {
-        if (wasMouseClicked()) {
-            String sale = m_saleName.getText();
-            if (null != sale) {
-                saveSale(sale);
-                m_trans.voidSale();
-                m_pos.refresh();
-            }
-        }
-    }
-
-    private void saveSale(String sale) {
-        final ClassLoader cl = this.getClassLoader(m_pos);
-        Thread.currentThread().setContextClassLoader(cl);
-        m_trans.saveSale(sale, m_pos);
-        this.m_dialog.closeDlg();
-    }
-
-    private ClassLoader getClassLoader(PosScreen pos) {
-        ClassLoader cl = pos.getClassLoader();
-        if (cl == null) {
-            try {
-                cl = Thread.currentThread().getContextClassLoader();
-            } catch (Throwable t) {
-            }
-            if (cl == null) {
-                Debug.log("No context classloader available; using class classloader", module);
-                try {
-                    cl = this.getClass().getClassLoader();
-                } catch (Throwable t) {
-                    Debug.logError(t, module);
-                }
-            }
-        }
-        return cl;
-    }    
+/*******************************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *******************************************************************************/
+package org.ofbiz.pos.screen;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+
+import net.xoetrope.swing.XButton;
+//import org.ofbiz.pos.screen.XFocusDialog;
+import net.xoetrope.swing.XEdit;
+import net.xoetrope.swing.XDialog;
+import net.xoetrope.xui.XPage;
+import net.xoetrope.xui.events.XEventHelper;
+
+import org.ofbiz.base.util.Debug;
+import org.ofbiz.base.util.UtilProperties;
+import org.ofbiz.pos.PosTransaction;
+
+
+public class SaveSale extends XPage {
+
+    /**
+     * To save a sale. 2 modes : save and keep the current sale or save and clear the current sale.  
+     */
+    public static final String module = SaveSale.class.getName();
+    protected static PosScreen m_pos = null;
+    protected XDialog m_dialog = null;
+    protected XEdit m_saleName = null;
+    protected XButton m_cancel = null;
+    protected XButton m_save = null;
+    protected XButton m_saveAndClear = null;
+    protected static PosTransaction m_trans = null;
+    public static SimpleDateFormat sdf = new SimpleDateFormat(UtilProperties.getMessage("pos","DateTimeFormat",Locale.getDefault()));
+
+    //TODO : make getter and setter for members (ie m_*) if needed (extern calls).  For that in Eclipse use Source/Generate Getters and setters
+
+    public SaveSale(PosTransaction trans, PosScreen page) {
+        m_trans = trans;
+        m_pos = page;
+    }
+
+    public void openDlg() {
+        m_dialog = (XDialog) pageMgr.loadPage(m_pos.getScreenLocation() + "/dialog/savesale");
+        m_saleName = (XEdit) m_dialog.findComponent("saleName");        
+        //m_dialog.setM_focused(m_saleName); 
+        m_saleName.setText(m_pos.session.getUserId() + " " + sdf.format(new Date()));
+        m_dialog.setCaption(UtilProperties.getMessage("pos", "SaveASale", Locale.getDefault()));
+
+        m_cancel = (XButton) m_dialog.findComponent("BtnCancel");
+        m_save = (XButton) m_dialog.findComponent("BtnSave");
+        m_saveAndClear = (XButton) m_dialog.findComponent("BtnSaveAndClear");
+
+        
+        XEventHelper.addMouseHandler(this, m_cancel, "cancel");
+        XEventHelper.addMouseHandler(this, m_save, "save");
+        XEventHelper.addMouseHandler(this, m_saveAndClear, "saveAndClear");
+
+        m_dialog.pack();
+        m_dialog.showDialog(this);
+    }
+
+    public synchronized void cancel()
+    {
+        if (wasMouseClicked()) {
+            this.m_dialog.closeDlg();
+        }
+    }
+
+    public synchronized void save() {
+        if (wasMouseClicked()) {
+            String sale = m_saleName.getText();
+            if (null != sale) {
+                saveSale(sale);
+            }
+        }
+    }
+
+    public synchronized void saveAndClear() {
+        if (wasMouseClicked()) {
+            String sale = m_saleName.getText();
+            if (null != sale) {
+                saveSale(sale);
+                m_trans.voidSale();
+                m_pos.refresh();
+            }
+        }
+    }
+
+    private void saveSale(String sale) {
+        final ClassLoader cl = this.getClassLoader(m_pos);
+        Thread.currentThread().setContextClassLoader(cl);
+        m_trans.saveSale(sale, m_pos);
+        this.m_dialog.closeDlg();
+    }
+
+    private ClassLoader getClassLoader(PosScreen pos) {
+        ClassLoader cl = pos.getClassLoader();
+        if (cl == null) {
+            try {
+                cl = Thread.currentThread().getContextClassLoader();
+            } catch (Throwable t) {
+            }
+            if (cl == null) {
+                Debug.log("No context classloader available; using class classloader", module);
+                try {
+                    cl = this.getClass().getClassLoader();
+                } catch (Throwable t) {
+                    Debug.logError(t, module);
+                }
+            }
+        }
+        return cl;
+    }    
 }

Propchange: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/SaveSale.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/SaveSale.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar  6 03:30:01 2008
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"