OFBiz › OFBiz - Commits

svn commit: r757096 [2/2] - in /ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos: ./ adaptor/ component/ config/ container/ device/ device/impl/ event/ jpos/factory/ jpos/service/ screen/

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

doogie-3

svn commit: r757096 [2/2] - in /ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos: ./ adaptor/ component/ config/ container/ device/ device/impl/ event/ jpos/factory/ jpos/service/ screen/

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/ScannerKybService.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/ScannerKybService.java?rev=757096&r1=757095&r2=757096&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/ScannerKybService.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/ScannerKybService.java Sat Mar 21 23:47:33 2009
@@ -6,9 +6,9 @@
* 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
@@ -32,7 +32,7 @@

/**
* Generic Keyboard Wedge Barcode Scanner
- *
+ *
* Configure your scanner:
* 1) Send STX Preamble
* 2) Send barcode id as prefix
@@ -89,7 +89,7 @@
return this.decodeData;
}

- public void setDecodeData(boolean b) throws JposException {
+ public void setDecodeData(boolean b) throws JposException {
this.decodeData = b;
}

@@ -132,7 +132,7 @@

public int getPowerState() throws JposException {
return 0;
- }
+ }

// KeyboardReceiver
public synchronized void receiveData(int[] codes, char[] chars) {
@@ -151,7 +151,7 @@

// parse the scanned data
if (str != null) {
- str = str.trim();
+ str = str.trim();
this.scannedData = str.getBytes();
if (this.decodeData) {
if (this.codeLocation == TYPELOC_PREFIX) {
@@ -163,7 +163,7 @@
} else {
this.codeId = "";
this.scannedDataLabel = str.getBytes();
- }
+ }
}
}
}

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java?rev=757096&r1=757095&r2=757096&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java Sat Mar 21 23:47:33 2009
@@ -6,9 +6,9 @@
* 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
@@ -49,9 +49,9 @@
public class ConfigureItem extends XPage {

/**
- * To create or configure a configurable item
+ * To create or configure a configurable item
*/
-
+
public static final String module = ConfigureItem.class.getName();
protected PosScreen m_pos = null;
protected ConfigureItem m_configureItem = null;
@@ -78,7 +78,7 @@
m_pos = page;
m_configureItem = this;
}
-
+
public ProductConfigWrapper openDlg() {
// cache must be set to false because there's no method to remove actionhandlers
m_dialog = (XDialog) pageMgr.loadPage(
@@ -87,7 +87,7 @@

m_optionListPane = (XScrollPane) m_dialog.findComponent("optionListPane");
m_configList = (XList) m_dialog.findComponent("configList");
- m_optionList = (XList) m_dialog.findComponent("optionList");
+ m_optionList = (XList) m_dialog.findComponent("optionList");
m_ok = (XButton) m_dialog.findComponent("BtnOk");
m_reset = (XButton) m_dialog.findComponent("BtnReset");

@@ -103,13 +103,13 @@

return m_pcw;
}
-
+
public synchronized void ok() {
if (wasMouseClicked()) {
closeDlg();
}
}
-
+
public synchronized void reset() {
if (wasMouseClicked()) {
m_pcw.setDefaultConfig();
@@ -137,12 +137,12 @@
m_dialog.repaint();
return;
}
-
-
+
+
private void closeDlg() {
m_dialog.closeDlg();
}
-
+
private void resetButtons() {
Object[] questions = questionHashMap.values().toArray();
for(Object question : questions) {
@@ -150,14 +150,14 @@
}
return;
}
-
+
private void showItem() {
- DefaultListModel listModel = null;
+ DefaultListModel listModel = null;
listModel = new DefaultListModel();
-
+
GenericValue gv = m_pcw.getProduct();
- listModel.addElement(gv.get("description"));
-
+ listModel.addElement(gv.get("description"));
+
List questions = m_pcw.getQuestions();
if (questions==null) ; // no questions, we shouldn't be here
else{
@@ -173,7 +173,7 @@
}
}
}
- }
+ }
m_configList.setModel(listModel);
return;
}
@@ -182,7 +182,7 @@

QuestionFactory qf = new QuestionFactory();
questionHashMap = new Hashtable();
-
+
List questions = m_pcw.getQuestions();
if (questions==null) ; // no questions, we shouldn't be here
else{
@@ -201,7 +201,7 @@
}
return;
}
-
+
private void getButtons() {
ArrayList buttonList = new ArrayList();
for(String[] buttonSingleArray : buttonArray ) {
@@ -213,16 +213,16 @@
}
m_buttonList = buttonList;
}
-
+
private void debugQuestions() {
//Debug.logInfo("debugQuestions",module);
GenericValue gv = m_pcw.getProduct();

//Debug.logInfo("Product: " +gv.get("description"), module);
-
+
List questions = m_pcw.getQuestions();
if (questions==null) return; // no questions, return
-
+
Iterator iter = questions.iterator();
while (iter.hasNext()) {
ConfigItem question = (ConfigItem)iter.next();
@@ -232,10 +232,10 @@
", IsSelected: "+question.isSelected()+
", IsSingleChoice: "+question.isSingleChoice()+
", IsStandard: "+question.isStandard(), module);*/
-
+
List options = question.getOptions();
Iterator itero = options.iterator();
-
+
while (itero.hasNext()) {
ConfigOption configoption = (ConfigOption)itero.next();
/*Debug.logInfo("Found option " + configoption.getDescription(), module);
@@ -266,17 +266,17 @@
What is isStandard? Maybe I can key off IsStandard for using buttons, others get a list.

*/
-
+
protected class QuestionFactory{
-
+
public Question get(ConfigItem question) {

- List options = question.getOptions();
+ List options = question.getOptions();
if (question.isSingleChoice()) {
if (options.size()>2) {
return new ListButtonQuestion(question);
} else {
- //TODO: this doesn't handle the case of
+ //TODO: this doesn't handle the case of
// two options with none required to be selected
return new SingleButtonQuestion(question);
}
@@ -287,22 +287,22 @@
}
}

- protected interface Question{
+ protected interface Question{
public void setupButton(XButton button);
//public void setupList(XList list);
public void buttonClicked();
public void reset();
}
-
+
protected interface ListQuestion{
public void setupListPane(XScrollPane m_optionListPane);
}
-
+
protected class SingleButtonQuestion implements Question{
private XButton button = null;
private ConfigItem question = null;
private int showOption = 0;
-
+
public SingleButtonQuestion(ConfigItem question) {
this.question = question;
return;
@@ -315,7 +315,7 @@
ConfigOption selectedOption = question.getSelected();
showOption = options.indexOf(selectedOption);
}
- ConfigOption configoption = (ConfigOption)options.get(showOption);
+ ConfigOption configoption = (ConfigOption)options.get(showOption);
button.setText(configoption.getDescription());
return;
}
@@ -327,15 +327,15 @@
public void buttonClicked() {
//only two choices, if the button is clicked, toggle
List options = question.getOptions();
- ConfigOption unselectedoption = (ConfigOption)options.get(showOption);
+ ConfigOption unselectedoption = (ConfigOption)options.get(showOption);
unselectedoption.setSelected(false);
showOption = (showOption+1)%2;
- ConfigOption selectedoption = (ConfigOption)options.get(showOption);
+ ConfigOption selectedoption = (ConfigOption)options.get(showOption);
selectedoption.setSelected(true);
button.setText(selectedoption.getDescription());
return;
}
-
+
public void reset() {
showOption = 0;
List options = question.getOptions();
@@ -343,9 +343,9 @@
ConfigOption selectedOption = question.getSelected();
showOption = options.indexOf(selectedOption);
}
- ConfigOption configoption = (ConfigOption)options.get(showOption);
+ ConfigOption configoption = (ConfigOption)options.get(showOption);
button.setText(configoption.getDescription());
- return;
+ return;
}
}

@@ -353,7 +353,7 @@
private XButton button = null;
private XScrollPane scrollpane = null;
private ConfigItem question = null;
-
+
public ListButtonQuestion(ConfigItem question) {
this.question = question;
return;
@@ -364,18 +364,18 @@
int showOption = 0;
button.setText(question.getQuestion());
return;
- }
+ }

public void setupListPane(XScrollPane m_optionListPane) {
scrollpane = m_optionListPane;
return;
}
-
+
public void buttonClicked() {
Iterator options = question.getOptions().iterator();
-
+
DefaultListModel listModel = new DefaultListModel();
-
+
while (options.hasNext()) {
ConfigOption configoption = (ConfigOption)options.next();
listModel.addElement(configoption.getDescription());
@@ -383,7 +383,7 @@
//Debug.logInfo("IsAvailable: "+configoption.isAvailable()+
// ", IsSelected: "+configoption.isSelected(), module);
}
-
+
//Create the list and put it in a scroll pane.
JList list = new JList(listModel);
list.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
@@ -394,19 +394,19 @@
scrollpane.add(list);
return;
}
-
+
public void reset() {
return;
}
- }
-
+ }
+
protected class LBQSelectionHandler implements ListSelectionListener {
private ConfigItem question = null;
-
+
public void setQuestion(ConfigItem question) {
this.question = question;
}
-
+
public void valueChanged(ListSelectionEvent event) {
try {
JList jlist = (JList)event.getSource();
@@ -429,7 +429,7 @@
}
catch (Exception ex) {
Debug.logInfo(ex.getMessage(), module);
- ex.printStackTrace();
+ ex.printStackTrace();
}
}
}

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/DialogCallback.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/DialogCallback.java?rev=757096&r1=757095&r2=757096&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/DialogCallback.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/DialogCallback.java Sat Mar 21 23:47:33 2009
@@ -6,9 +6,9 @@
* 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

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/Keyboard.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/Keyboard.java?rev=757096&r1=757095&r2=757096&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/Keyboard.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/Keyboard.java Sat Mar 21 23:47:33 2009
@@ -6,9 +6,9 @@
* 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
@@ -90,7 +90,7 @@
XButton button = null;
for(String key : keys) {
button = (XButton) m_dialog.findComponent("char" + key);
- XEventHelper.addMouseHandler(this, button, "trigger" + key);
+ XEventHelper.addMouseHandler(this, button, "trigger" + key);
}
}

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=757096&r1=757095&r2=757096&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 Sat Mar 21 23:47:33 2009
@@ -6,9 +6,9 @@
* 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
@@ -42,9 +42,9 @@
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)
+ * 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;
@@ -55,7 +55,7 @@
protected XButton m_replace = null;
protected XButton m_delete = null;
protected XButton m_replaceAndDelete = null;
- protected DefaultListModel m_listModel = 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
@@ -92,7 +92,7 @@
}
m_salesList.setModel(m_listModel);
m_salesList.setVisibleRowCount(-1);
- m_salesList.ensureIndexIsVisible(m_salesList.getItemCount());
+ m_salesList.ensureIndexIsVisible(m_salesList.getItemCount());
m_salesList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
m_salesList.setToolTipText(UtilProperties.getMessage(PosTransaction.resource, "PosLoadSaleListDblClickTip", Locale.getDefault()));

@@ -216,11 +216,11 @@
if (!m_trans.addListToCart(sale, m_pos, addToCart)) {
// if (!m_trans.restoreOrder(sale, m_pos, addToCart)) { // TODO use order instead of shopping list
Debug.logError("Error while loading cart from shopping list : " + sale, module);
- }
+ }
else {
m_trans.calcTax();
m_pos.refresh();
- }
+ }
closeDlg();
}

@@ -241,7 +241,7 @@
}
}
return cl;
- }
+ }

private void closeDlg() {
m_dialog.closeDlg();

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/NumericKeypad.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/NumericKeypad.java?rev=757096&r1=757095&r2=757096&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/NumericKeypad.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/NumericKeypad.java Sat Mar 21 23:47:33 2009
@@ -26,7 +26,7 @@

public String openDlg() {

- m_pageSupport = pageMgr.loadPage(m_pos.getScreenLocation() + "/dialog/numeric");
+ m_pageSupport = pageMgr.loadPage(m_pos.getScreenLocation() + "/dialog/numeric");
m_dialog = (XDialog)m_pageSupport;

m_edit = (XEdit) m_pageSupport.findComponent("numeric_input");
@@ -104,7 +104,7 @@
}
if (getPercent()) {
button = (XButton) m_dialog.findComponent("numPercent");
- XEventHelper.addMouseHandler(this, button, "triggerMinus");
+ XEventHelper.addMouseHandler(this, button, "triggerMinus");
} else {
disableButton("numPercent");
}
@@ -191,7 +191,7 @@
if (wasMouseClicked()) {
String text = "";
try {
- text = m_edit.getText();
+ text = m_edit.getText();
} catch (NullPointerException e) {
// getText throws exception if no text
text = "";
@@ -205,7 +205,7 @@

m_dialog.repaint();
return;
- }
+ }
}

private int countChars(String string, char c) {
@@ -239,7 +239,7 @@
private synchronized void clear() {
if (wasMouseClicked()) {
String text = "";
- m_edit.setText(text);
+ m_edit.setText(text);
m_dialog.repaint();
return;
}
@@ -249,13 +249,13 @@
if (wasMouseClicked()) {
String text = "";
try {
- text = m_edit.getText();
+ text = m_edit.getText();
} catch (NullPointerException e) {
// getText throws exception if no text
text = "";
} finally {
- m_edit.setText(text + c);
- }
+ m_edit.setText(text + c);
+ }
m_dialog.repaint();
//update the screen?
return;
@@ -266,13 +266,13 @@
if (wasMouseClicked()) {
String text = "";
try {
- text = m_edit.getText();
+ text = m_edit.getText();
} catch (NullPointerException e) {
// getText throws exception if no text
text = "";
} finally {
- m_edit.setText(text + c);
- }
+ m_edit.setText(text + c);
+ }
m_dialog.repaint();
//update the screen?
return;

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PaidInOut.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PaidInOut.java?rev=757096&r1=757095&r2=757096&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PaidInOut.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PaidInOut.java Sat Mar 21 23:47:33 2009
@@ -49,7 +49,7 @@
/**
* To allow creating or choising a reason for a PAID IN or OUT
*/
-
+
public static final String module = PaidInOut.class.getName();
protected static PosScreen m_pos = null;
protected XDialog m_dialog = null;
@@ -96,7 +96,7 @@

m_comboModel = new DefaultComboBoxModel();
List<GenericValue> posPaidReasons = FastList.newInstance();
- if (m_type.equals("IN")) {
+ if (m_type.equals("IN")) {
m_dialog.setCaption(UtilProperties.getMessage(PosTransaction.resource, "PosPaidInTitle", locale));
try {
posPaidReasons = m_trans.getSession().getDelegator().findByAndCache("Enumeration", UtilMisc.toMap("enumTypeId", "POS_PAID_REASON_IN"));
@@ -108,7 +108,7 @@
try {
posPaidReasons = m_trans.getSession().getDelegator().findByAndCache("Enumeration", UtilMisc.toMap("enumTypeId", "POS_PAID_REASON_OUT"));
} catch (GenericEntityException e) {
- Debug.logError(e, module); }
+ Debug.logError(e, module); }
}
for (GenericValue reason : posPaidReasons) {
m_comboModel.addElement(reason.get("description", locale));
@@ -122,9 +122,9 @@
if (cancelled) {
return new HashMap<String, String>();
} else {
- return UtilMisc.toMap("amount", m_amountEdit.getText(),
- "reason", (String)(posPaidReasons.get(m_reasonCombo.getSelectedIndex())).get("enumId"),
- "reasonComment", (String) m_reasonCommentEdit.getText());
+ return UtilMisc.toMap("amount", m_amountEdit.getText(),
+ "reason", (String)(posPaidReasons.get(m_reasonCombo.getSelectedIndex())).get("enumId"),
+ "reasonComment", (String) m_reasonCommentEdit.getText());
}
}

@@ -150,7 +150,7 @@
try {
NumericKeypad numericKeypad = new NumericKeypad(m_pos);
numericKeypad.setMinus(true);
- numericKeypad.setPercent(false);
+ numericKeypad.setPercent(false);
m_amountEdit.setText(numericKeypad.openDlg());
} catch (Exception e) {
Debug.logError(e, module);

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PosDialog.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PosDialog.java?rev=757096&r1=757095&r2=757096&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PosDialog.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PosDialog.java Sat Mar 21 23:47:33 2009
@@ -6,9 +6,9 @@
* 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
@@ -149,7 +149,7 @@
}

public void reset() {
- if (dialog.isEnabled()) {
+ if (dialog.isEnabled()) {
thisPosDialog.checkSize();
Dimension wSize = dialog.getSize();
dialog.setLocation(appWindow.getLocation().x + (appWindow.getSize().width / 2 - wSize.width / 2),
@@ -337,13 +337,13 @@

public void posDialogSetVisible(boolean visible) {
posDialogVisible = visible;
- SwingUtilities.invokeLater(
+ SwingUtilities.invokeLater(
new Runnable() {
public void run() {
dialog.setVisible(posDialogVisible);
}
- }
+ }
);
}
-
+
}

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=757096&r1=757095&r2=757096&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 Sat Mar 21 23:47:33 2009
@@ -6,9 +6,9 @@
* 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
@@ -49,7 +49,7 @@

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();
public static final Window appWin = XProjectManager.getCurrentProject().getAppWindow();
@@ -75,7 +75,7 @@
protected boolean inDialog = false;

private Locale defaultLocale = Locale.getDefault();
-
+
public PosScreen() {
super();
this.classLoader = Thread.currentThread().getContextClassLoader();
@@ -85,7 +85,7 @@
public void pageCreated() {
super.pageCreated();

- // initial settings
+ // initial settings
this.setEnabled(false);
this.setVisible(false);

@@ -98,11 +98,11 @@
this.setLastActivity(System.currentTimeMillis());

if (!firstInit) {
- firstInit = true;
-
+ firstInit = true;
+
// pre-load a few screens
-
- currentProject.getPageManager().loadPage(this.getScreenLocation() + "/paypanel");
+
+ currentProject.getPageManager().loadPage(this.getScreenLocation() + "/paypanel");
currentProject.getPageManager().loadPage(this.getScreenLocation() + "/mgrpanel");
currentProject.getPageManager().loadPage(this.getScreenLocation() + "/promopanel");

@@ -120,7 +120,7 @@
appWin.addFocusListener(this);

// close the splash screen
- SplashLoader.close();
+ SplashLoader.close();
}

// buttons are different per screen
@@ -146,7 +146,7 @@
}

currentScreen = this;
- this.refresh();
+ this.refresh();
}

public void pageDeactivated() {
@@ -303,7 +303,7 @@
if (pageName.startsWith("/")) {
pageName = pageName.substring(1);
}
- XPage newPage = (XPage)currentProject.getPageManager().showPage(this.getScreenLocation() + "/" + pageName);
+ XPage newPage = (XPage)currentProject.getPageManager().showPage(this.getScreenLocation() + "/" + pageName);
if (newPage instanceof PosScreen) {
if (refresh) ((PosScreen) newPage).refresh();
return (PosScreen) newPage;
@@ -332,14 +332,14 @@
}

public PosDialog showDialog(String pageName, DialogCallback cb) {
- return showDialog(pageName, cb, null);
+ return showDialog(pageName, cb, null);
}

public PosDialog showDialog(String pageName, DialogCallback cb, String text) {
if (pageName.startsWith("/")) {
pageName = pageName.substring(1);
}
- XPage dialogPage = (XPage)currentProject.getPageManager().loadPage(this.getScreenLocation() + "/" + pageName);
+ XPage dialogPage = (XPage)currentProject.getPageManager().loadPage(this.getScreenLocation() + "/" + pageName);
PosDialog dialog = PosDialog.getInstance(dialogPage, true, 0);
dialog.showDialog(this, cb, text);
return dialog;
@@ -392,11 +392,11 @@
}
return this.scrLocation;
}
-
+
public void setWaitCursor() {
- setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
+ setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
}
public void setNormalCursor() {
- setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
+ setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
}
}

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=757096&r1=757095&r2=757096&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 Sat Mar 21 23:47:33 2009
@@ -6,9 +6,9 @@
* 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
@@ -39,9 +39,9 @@
public class SaveSale extends XPage {

/**
- * To save a sale. 2 modes : save and keep the current sale or save and clear the current sale.
+ * 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;
@@ -64,8 +64,8 @@

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 = (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(PosTransaction.resource, "PosSaveASale", Locale.getDefault()));

@@ -79,7 +79,7 @@
XEventHelper.addMouseHandler(this, m_save, "save");
XEventHelper.addMouseHandler(this, m_saveAndClear, "saveAndClear");
// Save and Print
- //XEventHelper.addMouseHandler(this, m_saveAndPrint, "saveAndPrint"); //FIXME : button does not exist yet
+ //XEventHelper.addMouseHandler(this, m_saveAndPrint, "saveAndPrint"); //FIXME : button does not exist yet
XEventHelper.addMouseHandler(this, m_saleName, "editSaleName");

m_dialog.pack();
@@ -131,7 +131,7 @@
if (wasMouseClicked() && ShowKeyboardInSaveSale) {
try {
Keyboard keyboard = new Keyboard(m_pos);
- keyboard.setText(m_saleName.getText());
+ keyboard.setText(m_saleName.getText());
m_saleName.setText(keyboard.openDlg());
} catch (Exception e) {
Debug.logError(e, module);
@@ -144,7 +144,7 @@
private void saveSale(String sale) {
final ClassLoader cl = this.getClassLoader(m_pos);
Thread.currentThread().setContextClassLoader(cl);
- m_trans.saveSale(sale, m_pos);
+ m_trans.saveSale(sale, m_pos);
// m_trans.saveOrder(sale, m_pos); // TODO use order instead of shopping list
this.m_dialog.closeDlg();
}
@@ -166,5 +166,5 @@
}
}
return cl;
- }
+ }
}

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/SelectProduct.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/SelectProduct.java?rev=757096&r1=757095&r2=757096&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/SelectProduct.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/SelectProduct.java Sat Mar 21 23:47:33 2009
@@ -6,9 +6,9 @@
* 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
@@ -41,7 +41,7 @@
/**
* To choose a product in a list of products whith the same bar code
*/
-
+
public static final String module = SelectProduct.class.getName();
protected static PosScreen m_pos = null;
protected XDialog m_dialog = null;
@@ -71,7 +71,7 @@

m_cancel = (XButton) dlg.findComponent("BtnCancel");
m_select = (XButton) dlg.findComponent("BtnSelect");
-
+
XEventHelper.addMouseHandler(this, m_cancel, "cancel");
XEventHelper.addMouseHandler(this, m_select, "selectProduct");

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/XFocusDialog.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/XFocusDialog.java?rev=757096&r1=757095&r2=757096&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/XFocusDialog.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/XFocusDialog.java Sat Mar 21 23:47:33 2009
@@ -6,9 +6,9 @@
* 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
@@ -27,28 +27,28 @@
//import org.ofbiz.base.util.Debug;
//
public class XFocusDialog extends XDialog {
-//
+//
// protected XEdit m_focused = null;
//
// public XFocusDialog() {
// super();
// }
-//
+//
// public void pageActivated() {
// super.pageActivated();
// setFocus();
// }
-//
+//
// public void setFocus() {
-// SwingUtilities.invokeLater(
+// SwingUtilities.invokeLater(
// new Runnable() {
// public void run() {
// Debug.logInfo( "isEditable in setFocus :" + m_focused.isEditable(), "======================================" );
// Debug.logInfo( "isEnabled in setFocus: " + m_focused.isEnabled(), "======================================" );
-// Debug.logInfo( "isFocusable in setFocus :" + m_focused.isFocusable(), "======================================" );
+// Debug.logInfo( "isFocusable in setFocus :" + m_focused.isFocusable(), "======================================" );
// m_focused.requestFocusInWindow();
// }
-// }
+// }
// );
// }
//
@@ -58,7 +58,7 @@
// public void setM_focused(XEdit focused) {
// Debug.logInfo( "isEditable in setM_focused :" + focused.isEditable(), "======================================" );
// Debug.logInfo( "isEnabled in setM_focused :" + focused.isEnabled(), "======================================" );
-// Debug.logInfo( "isFocusable in setM_focused :" + focused.isFocusable(), "======================================" );
+// Debug.logInfo( "isFocusable in setM_focused :" + focused.isFocusable(), "======================================" );
// this.m_focused = focused;
// }
}