[brailleblaster] push by rebecca....@xxxxxxxxx - added saveSettings method and getProperty if statement using propertyF... on 2014-12-18 21:18 GMT
- From: brailleblaster@xxxxxxxxxxxxxx
- To: brailleblaster@xxxxxxxxxxxxx
- Date: Thu, 18 Dec 2014 21:18:37 +0000
Revision: 1c99b2d24465
Branch: rt1738
Author: Rebecca Luttmer <rebecca.luttmer@xxxxxxxxx>
Date: Thu Dec 18 21:17:33 2014 UTC
Log: added saveSettings method and getProperty if statement using
propertyFileManager
https://code.google.com/p/brailleblaster/source/detail?r=1c99b2d24465
Modified:
/src/main/org/brailleblaster/settings/SettingsManager.java
/src/main/org/brailleblaster/settings/ui/ConfigPanel.java
/src/main/org/brailleblaster/settings/ui/PagePropertiesTab.java
=======================================
--- /src/main/org/brailleblaster/settings/SettingsManager.java Wed Dec 17
21:29:31 2014 UTC
+++ /src/main/org/brailleblaster/settings/SettingsManager.java Thu Dec 18
21:17:33 2014 UTC
@@ -183,7 +183,7 @@
public Page[] getStandardSizes(){
return standardPages;
}
-
+ //essential to save
public void saveConfiguration(HashMap<String, String>map){
outputMap.clear();
resetMap(map);
@@ -205,7 +205,7 @@
e.printStackTrace();
}
}
-
+ //
public HashMap<String, String> getMapClone(){
HashMap<String, String>temp = new HashMap<String, String>();
=======================================
--- /src/main/org/brailleblaster/settings/ui/ConfigPanel.java Wed Oct 29
17:01:19 2014 UTC
+++ /src/main/org/brailleblaster/settings/ui/ConfigPanel.java Thu Dec 18
21:17:33 2014 UTC
@@ -57,7 +57,7 @@
public void widgetSelected(SelectionEvent e) {
String errorStr = null;
if( translationSettings.validate() && (errorStr =
pageProperties.validate()).compareTo("SUCCESS") == 0 && advTab.validate() ){
-
sm.saveConfiguration(settingsCopy);
+
sm.saveConfiguration(settingsCopy);//essential to save
sm.close();
m.refresh();
}
=======================================
--- /src/main/org/brailleblaster/settings/ui/PagePropertiesTab.java Wed Dec
17 21:29:31 2014 UTC
+++ /src/main/org/brailleblaster/settings/ui/PagePropertiesTab.java Thu Dec
18 21:17:33 2014 UTC
@@ -2,6 +2,7 @@
import java.io.File;
import java.io.IOException;
+import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map.Entry;
import java.util.Properties;
@@ -38,6 +39,8 @@
import org.eclipse.swt.widgets.Text;
import org.eclipse.swt.widgets.Display;//rl
import org.brailleblaster.util.PropertyFileManager;
+import org.brailleblaster.settings.ui.ConfigPanel;
+import org.brailleblaster.util.FileUtils;
public class PagePropertiesTab {
HashMap<String, String>settingsMap;
@@ -45,6 +48,7 @@
TabItem item;
Composite group;
PropertyFileManager pfm;
+ FileUtils fu;
//ttss
private static final String USER_SETTINGS =
BBIni.getUserProgramDataPath() + BBIni.getFileSep() + "liblouisutdml" +
BBIni.getFileSep() + "lbu_files" + BBIni.getFileSep()
+ "utdmlSettings.properties";
@@ -57,14 +61,16 @@
boolean listenerLocked;
LocaleHandler lh;
- public static String units;//
- public static Boolean defaultUnits;//
+ public String units;//
+ public String defaultUnits;//
PagePropertiesTab(TabFolder folder, final SettingsManager sm,
HashMap<String, String>settingsMap){
+
+
lh = new LocaleHandler();
this.sm = sm;
this.settingsMap = settingsMap;
- listenerLocked = false;
+// listenerLocked = false;
item = new TabItem(folder, 0);
item.setText(lh.localValue("pageProperties"));
@@ -81,16 +87,15 @@
regionalButton = new Button(unitsGroup, SWT.RADIO);
regionalButton.setText(lh.localValue("regional"));
-// regionalButton.setSelection(true); // default
cellsLinesButton = new Button(unitsGroup, SWT.RADIO);
cellsLinesButton.setText(lh.localValue("cellsLines"));
-
- PropertyFileManager = new PropertyFileManager(USER_SETTINGS);
- if (pfm.getProperty(units)=="regional")
- regionalButton.setSelection(true);
- else
+ PropertyFileManager pfm = new
PropertyFileManager(USER_SETTINGS);
+ String value = pfm.getProperty("unitsGroup");
+ if (value=="cellsLines")
cellsLinesButton.setSelection(true);
+ else
+ regionalButton.setSelection(true);
//rl
@@ -200,42 +205,97 @@
}
private void addMarginListener(final Text t, final String type){
- if(type.equals("leftMargin") || type.equals("rightMargin")){
- t.addModifyListener(new ModifyListener(){
- @Override
- public void modifyText(ModifyEvent e) {
- Double margin = getDoubleValue(t);
-
- if(margin >= getDoubleValue(widthBox) ||
(getDoubleValue(marginLeftBox) + getDoubleValue(marginRightBox) >=
getDoubleValue(widthBox))){
- new
Notify(lh.localValue("incorrectMarginWidth"));
-
t.setText(settingsMap.get(type));
- }
- else {
- settingsMap.put(type,
getStringValue(t));
-
cellsBox.setText(String.valueOf(calculateCellsPerLine(Double.valueOf(widthBox.getText()))));
-
linesBox.setText(String.valueOf(calculateLinesPerPage(Double.valueOf(heightBox.getText()))));
- }
- }
- });
- }
- else {
- t.addModifyListener(new ModifyListener(){
- @Override
- public void modifyText(ModifyEvent e) {
- Double margin = getDoubleValue(t);
+ if (!listenerLocked){
+ if(type.equals("leftMargin") ||
type.equals("rightMargin")){
+
+ t.addModifyListener(new ModifyListener(){
+ @Override
+ public void modifyText(ModifyEvent e) {
- if(margin >= Double.valueOf(heightBox.getText()) ||
(getDoubleValue(marginTopBox) + getDoubleValue(marginBottomBox) >=
getDoubleValue(widthBox))){
- new
Notify(lh.localValue("incorectMarginHeight"));
-
t.setText(settingsMap.get(type));
- }
- else {
- settingsMap.put(type,
getStringValue(t));
-
cellsBox.setText(String.valueOf(calculateCellsPerLine(Double.valueOf(widthBox.getText()))));
-
linesBox.setText(String.valueOf(calculateLinesPerPage(Double.valueOf(heightBox.getText()))));
- }
+
+ Double margin =
getDoubleValue(t);
+
+ if(margin >= getDoubleValue(widthBox) ||
(getDoubleValue(marginLeftBox) + getDoubleValue(marginRightBox) >=
getDoubleValue(widthBox))){
+ new
Notify(lh.localValue("incorrectMarginWidth"));
+
t.setText(settingsMap.get(type));
+ }
+ else {
+ settingsMap.put(type,
getStringValue(t));
+
cellsBox.setText(String.valueOf(calculateCellsPerLine(Double.valueOf(widthBox.getText()))));
+
linesBox.setText(String.valueOf(calculateLinesPerPage(Double.valueOf(heightBox.getText()))));
+
+ }
}
- });
+ });
+ }
+ else {
+ t.addModifyListener(new ModifyListener(){
+ @Override
+ public void modifyText(ModifyEvent e) {
+ if (!listenerLocked){
+
+ Double margin =
getDoubleValue(t);
+
+ if(margin >= Double.valueOf(heightBox.getText()) ||
(getDoubleValue(marginTopBox) + getDoubleValue(marginBottomBox) >=
getDoubleValue(widthBox))){
+ new
Notify(lh.localValue("incorectMarginHeight"));
+
t.setText(settingsMap.get(type));
+ }
+ else {
+ settingsMap.put(type,
getStringValue(t));
+
cellsBox.setText(String.valueOf(calculateCellsPerLine(Double.valueOf(widthBox.getText()))));
+
linesBox.setText(String.valueOf(calculateLinesPerPage(Double.valueOf(heightBox.getText()))));
+ }
+ }
+ }
+ });
+ }
+
}
+// else{//
+// if(type.equals("leftMargin") || type.equals("rightMargin")){
+//
+// t.addModifyListener(new ModifyListener(){
+// @Override
+// public void modifyText(ModifyEvent e) {
+//
+//
+// Double margin = getDoubleValue(t);
+//
+// if(margin >= getDoubleValue(widthBox) ||
(getDoubleValue(marginLeftBox) + getDoubleValue(marginRightBox) >=
getDoubleValue(widthBox))){
+// new
Notify(lh.localValue("incorrectMarginWidth"));
+//
t.setText(settingsMap.get(type));
+// }
+// else {
+// settingsMap.put(type,
getStringValue(t));
+//
cellsBox.setText(String.valueOf(calculateCellsPerInch(Double.valueOf(widthBox.getText()))));
+//
linesBox.setText(String.valueOf(calculateLinesPerInch(Double.valueOf(heightBox.getText()))));
+//
+// }
+// }
+// });
+// }
+// else {
+// t.addModifyListener(new ModifyListener(){
+// @Override
+// public void modifyText(ModifyEvent e) {
+// if (!listenerLocked){
+//
+// Double margin = getDoubleValue(t);
+//
+// if(margin >= Double.valueOf(heightBox.getText()) ||
(getDoubleValue(marginTopBox) + getDoubleValue(marginBottomBox) >=
getDoubleValue(widthBox))){
+// new
Notify(lh.localValue("incorectMarginHeight"));
+//
t.setText(settingsMap.get(type));
+// }
+// else {
+// settingsMap.put(type,
getStringValue(t));
+//
cellsBox.setText(String.valueOf(calculateCellsPerInch(Double.valueOf(widthBox.getText()))));
+//
linesBox.setText(String.valueOf(calculateLinesPerInch(Double.valueOf(heightBox.getText()))));
+// }
+// }
+// }
+// });
+// }
+// }
}
private void setStandardPages(){
@@ -270,15 +330,13 @@
regionalButton.addSelectionListener(new SelectionAdapter(){
public void widgetSelected(SelectionEvent e){
- regionalButton.setSelection(true);
- defaultUnits=true;
+ defaultUnits="regional";
modifyMargins(defaultUnits);
}
});
cellsLinesButton.addSelectionListener(new SelectionAdapter(){
public void widgetSelected(SelectionEvent e){
- cellsLinesButton.setSelection(true);
- defaultUnits=false;
+ defaultUnits="cellsLines";
modifyMargins(defaultUnits);
}
});
@@ -471,10 +529,12 @@
}
//This will modify the margins value and the margins text box. It will
receive a boolean default units from the listeners
//to the radio buttons
- public void modifyMargins(Boolean defaultUnits){
- if (defaultUnits){
+ public void modifyMargins(String defaultUnits){
+ listenerLocked = true;
+ if (defaultUnits=="regional"){
units = "regional";
+
regionalButton.setSelection(true);
cellsLinesButton.setSelection(false);
@@ -490,17 +550,14 @@
String bottomMargin = settingsMap.get("bottomMargin");
marginBottomBox.setText(bottomMargin);
- //ttss
-// PropertyFileManager pfm = new
PropertyFileManager(USER_SETTINGS);
-// pfm.save("unitsGroup",units);
- saveSettings(units);
-
+ saveSettings(units);
+
}
else{
-
units = "cellsLines";
+
cellsLinesButton.setSelection(true);
regionalButton.setSelection(false);
@@ -520,29 +577,29 @@
String bottomMargin = settingsMap.get("bottomMargin");
String convertedBottomMargin =
String.valueOf(calculateLinesPerInch(Double.valueOf(bottomMargin)));
marginBottomBox.setText(convertedBottomMargin);
- //ttss
-// PropertyFileManager pfm = new
PropertyFileManager(USER_SETTINGS);
-// pfm.save("unitsGroup",units);
+
saveSettings(units);
+
}
}
-
+
private void saveSettings(String units){
File f = new File(USER_SETTINGS);
- try {
- if(!f.exists())
- f.createNewFile();
-
- PropertyFileManager pfm = new
PropertyFileManager(USER_SETTINGS);
- pfm.save("unitsGroup", units);
- } catch (IOException e) {
- e.printStackTrace();
- }
+ try {
+ if(!f.exists())
+ f.createNewFile();
+
+ PropertyFileManager pfm = new
PropertyFileManager(USER_SETTINGS);
+ pfm.save("unitsGroup", units);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
}
private int calculateCellsPerLine(double pWidth){
+
double cellWidth;
if(!sm.isMetric())
cellWidth = 0.246063;
@@ -556,6 +613,7 @@
pWidth -=
Double.valueOf(settingsMap.get("rightMargin"));
return (int)(pWidth / cellWidth);
+
}
private int calculateLinesPerInch(double inches){
@@ -568,6 +626,7 @@
}
private int calculateLinesPerPage(double pHeight){
+
double cellHeight;
if(!sm.isMetric())
cellHeight = 0.393701;
@@ -581,6 +640,7 @@
pHeight -=
Double.valueOf(settingsMap.get("bottomMargin"));
return (int)(pHeight / cellHeight);
+
}
public int calculateCellsPerInch(double inches){
double cellWidth;
Other related posts:
- » [brailleblaster] push by rebecca....@xxxxxxxxx - added saveSettings method and getProperty if statement using propertyF... on 2014-12-18 21:18 GMT - brailleblaster
