From: <cs-...@li...> - 2011-02-28 20:08:56
|
details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgrepo/c/cs/cs-studio/cs-studio/rev/fb4ae1944472 changeset: 9353:fb4ae1944472 user: xihui <ch...@or...> date: Mon Feb 28 15:06:00 2011 -0500 description: o.c.logging: compatible with Eclipse 3.6.0 details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgrepo/c/cs/cs-studio/cs-studio/rev/962cac2a2a1a changeset: 9354:962cac2a2a1a user: xihui <ch...@or...> date: Mon Feb 28 15:06:39 2011 -0500 description: BOY TextInput Widget: fix a bug that text value cannot be writting to local PV. details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgrepo/c/cs/cs-studio/cs-studio/rev/6b2ac34b5543 changeset: 9355:6b2ac34b5543 user: xihui <ch...@or...> date: Mon Feb 28 15:07:14 2011 -0500 description: update plugin name and contact diffstat: applications/plugins/org.csstudio.opibuilder.converter/META-INF/MANIFEST.MF | 4 +- applications/plugins/org.csstudio.opibuilder.examples/META-INF/MANIFEST.MF | 2 +- applications/plugins/org.csstudio.opibuilder.widgets/META-INF/MANIFEST.MF | 3 +- applications/plugins/org.csstudio.opibuilder.widgets/src/org/csstudio/opibuilder/widgets/editparts/TextInputEditpart.java | 50 ++++++--- applications/plugins/org.csstudio.opibuilder/META-INF/MANIFEST.MF | 5 +- applications/plugins/org.csstudio.swt.widgets/META-INF/MANIFEST.MF | 5 +- applications/plugins/org.csstudio.swt.xygraph/META-INF/MANIFEST.MF | 4 +- core/plugins/org.csstudio.logging.ui/META-INF/MANIFEST.MF | 6 +- core/plugins/org.csstudio.logging/META-INF/MANIFEST.MF | 2 +- 9 files changed, 52 insertions(+), 29 deletions(-) diffs (221 lines): diff -r 17aaf3abde33 -r 6b2ac34b5543 applications/plugins/org.csstudio.opibuilder.converter/META-INF/MANIFEST.MF --- a/applications/plugins/org.csstudio.opibuilder.converter/META-INF/MANIFEST.MF Mon Feb 28 14:22:46 2011 -0500 +++ b/applications/plugins/org.csstudio.opibuilder.converter/META-INF/MANIFEST.MF Mon Feb 28 15:07:14 2011 -0500 @@ -1,6 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Converter +Bundle-Name: EDM2BOY Converter +Bundle-Description: EDM to BOY Converter Bundle-SymbolicName: org.csstudio.opibuilder.converter;singleton:=true Bundle-Version: 1.0.2.qualifier Bundle-ClassPath: converter.jar, @@ -21,3 +22,4 @@ org.junit;bundle-version="3.8.2" Bundle-Activator: org.csstudio.opibuilder.converter.EDM2OPIConverterPlugin Bundle-ActivationPolicy: lazy +Bundle-Vendor: Xihui Chen<ch...@or...> - SNS diff -r 17aaf3abde33 -r 6b2ac34b5543 applications/plugins/org.csstudio.opibuilder.examples/META-INF/MANIFEST.MF --- a/applications/plugins/org.csstudio.opibuilder.examples/META-INF/MANIFEST.MF Mon Feb 28 14:22:46 2011 -0500 +++ b/applications/plugins/org.csstudio.opibuilder.examples/META-INF/MANIFEST.MF Mon Feb 28 15:07:14 2011 -0500 @@ -4,7 +4,7 @@ Bundle-SymbolicName: org.csstudio.opibuilder.examples;singleton:=true Bundle-Version: 1.0.3.qualifier Bundle-Activator: org.csstudio.opibuilder.examples.Activator -Bundle-Vendor: Xihui Chen +Bundle-Vendor: Xihui Chen<ch...@or...> - SNS Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.core.resources;bundle-version="3.4.0" diff -r 17aaf3abde33 -r 6b2ac34b5543 applications/plugins/org.csstudio.opibuilder.widgets/META-INF/MANIFEST.MF --- a/applications/plugins/org.csstudio.opibuilder.widgets/META-INF/MANIFEST.MF Mon Feb 28 14:22:46 2011 -0500 +++ b/applications/plugins/org.csstudio.opibuilder.widgets/META-INF/MANIFEST.MF Mon Feb 28 15:07:14 2011 -0500 @@ -1,6 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Widgets Plug-in +Bundle-Name: BOY Widgets Plug-in +Bundle-Description: Widgets for BOY Bundle-SymbolicName: org.csstudio.opibuilder.widgets;singleton:=true Bundle-Version: 1.1.0.qualifier Bundle-Activator: org.csstudio.opibuilder.widgets.Activator diff -r 17aaf3abde33 -r 6b2ac34b5543 applications/plugins/org.csstudio.opibuilder.widgets/src/org/csstudio/opibuilder/widgets/editparts/TextInputEditpart.java --- a/applications/plugins/org.csstudio.opibuilder.widgets/src/org/csstudio/opibuilder/widgets/editparts/TextInputEditpart.java Mon Feb 28 14:22:46 2011 -0500 +++ b/applications/plugins/org.csstudio.opibuilder.widgets/src/org/csstudio/opibuilder/widgets/editparts/TextInputEditpart.java Mon Feb 28 15:07:14 2011 -0500 @@ -144,8 +144,9 @@ try { setPVValue(AbstractPVWidgetModel.PROP_PVNAME, parseString(text)); } catch (Exception e) { - String msg = NLS.bind("Failed to write value to PV {0}: illegal input : {1} \n", - getPV(AbstractPVWidgetModel.PROP_PVNAME).getName(), text) + e.toString(); + String msg = NLS.bind("Failed to write value to PV {0} from widget {1}.\nIllegal input : {2} \n", + new String[]{getPV(AbstractPVWidgetModel.PROP_PVNAME).getName(), + getWidgetModel().getName(), text}) + e.toString(); ConsoleService.getInstance().writeError(msg); } return false; @@ -274,12 +275,18 @@ case STRING: if(((IDoubleValue)pvValue).getValues().length > 1){ return parseCharArray(text); - } - case DECIAML: + }else + return text; + case DECIAML: + case EXP: + return parseDouble(text, true); case DEFAULT: - case EXP: default: - return parseDouble(text, true); + try { + return parseDouble(text, true); + } catch (ParseException e) { + return text; + } } } @@ -291,12 +298,18 @@ case STRING: if(((ILongValue)pvValue).getValues().length > 1){ return parseCharArray(text); + }else + return text; + case DECIAML: + case EXP: + return parseDouble(text, true); + case DEFAULT: + default: + try { + return parseDouble(text, true); + } catch (ParseException e) { + return text; } - case DECIAML: - case DEFAULT: - case EXP: - default: - return parseDouble(text, true); } } @@ -307,11 +320,16 @@ return parseHEX(text, true); case STRING: return text; - case DEFAULT: case DECIAML: - case EXP: + case EXP: + return parseDouble(text, true); + case DEFAULT: default: - return parseDouble(text, true); + try { + return parseDouble(text, true); + } catch (ParseException e) { + return text; + } } } @@ -329,7 +347,7 @@ return iString; } - private Object parseDouble(final String text, final boolean coerce) throws ParseException { + private double parseDouble(final String text, final boolean coerce) throws ParseException { DecimalFormat format = new DecimalFormat(); double value = format.parse(text).doubleValue(); @@ -345,7 +363,7 @@ } - private Object parseHEX(final String text, final boolean coerce) { + private int parseHEX(final String text, final boolean coerce) { String valueText = text.trim(); if (text.startsWith(TextIndicatorEditPart.HEX_PREFIX)) { valueText = text.substring(2); diff -r 17aaf3abde33 -r 6b2ac34b5543 applications/plugins/org.csstudio.opibuilder/META-INF/MANIFEST.MF --- a/applications/plugins/org.csstudio.opibuilder/META-INF/MANIFEST.MF Mon Feb 28 14:22:46 2011 -0500 +++ b/applications/plugins/org.csstudio.opibuilder/META-INF/MANIFEST.MF Mon Feb 28 15:07:14 2011 -0500 @@ -1,10 +1,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: OPI Builder +Bundle-Name: BOY base plugin +Bundle-Description: Base plugin of BOY Bundle-SymbolicName: org.csstudio.opibuilder;singleton:=true Bundle-Version: 1.1.0.qualifier Bundle-Activator: org.csstudio.opibuilder.OPIBuilderPlugin -Bundle-Vendor: Xihui Chen +Bundle-Vendor: Xihui Chen<ch...@or...> - SNS Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff -r 17aaf3abde33 -r 6b2ac34b5543 applications/plugins/org.csstudio.swt.widgets/META-INF/MANIFEST.MF --- a/applications/plugins/org.csstudio.swt.widgets/META-INF/MANIFEST.MF Mon Feb 28 14:22:46 2011 -0500 +++ b/applications/plugins/org.csstudio.swt.widgets/META-INF/MANIFEST.MF Mon Feb 28 15:07:14 2011 -0500 @@ -1,10 +1,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Widgets +Bundle-Name: CSS Widgets +Bundle-Description: Widgets figure for draw2d and SWT applications. Bundle-SymbolicName: org.csstudio.swt.widgets Bundle-Version: 1.0.2.qualifier Bundle-Activator: org.csstudio.swt.widgets.Activator -Bundle-Vendor: SNS & DESY +Bundle-Vendor: Xihui Chen<ch...@or...> - SNS Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.csstudio.swt.xygraph;bundle-version="1.0.5";visibility:=reexport, diff -r 17aaf3abde33 -r 6b2ac34b5543 applications/plugins/org.csstudio.swt.xygraph/META-INF/MANIFEST.MF --- a/applications/plugins/org.csstudio.swt.xygraph/META-INF/MANIFEST.MF Mon Feb 28 14:22:46 2011 -0500 +++ b/applications/plugins/org.csstudio.swt.xygraph/META-INF/MANIFEST.MF Mon Feb 28 15:07:14 2011 -0500 @@ -1,11 +1,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: XYGraph Plug-in -Bundle-Description: Plotting library +Bundle-Description: Plotting library for draw2d and SWT applications Bundle-SymbolicName: org.csstudio.swt.xygraph Bundle-Version: 1.1.3.qualifier Bundle-Activator: org.csstudio.swt.xygraph.Activator -Bundle-Vendor: Xihui Chen, <5h...@or...> - SNS +Bundle-Vendor: Xihui Chen<ch...@or...> - SNS Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.draw2d;bundle-version="3.4.0", diff -r 17aaf3abde33 -r 6b2ac34b5543 core/plugins/org.csstudio.logging.ui/META-INF/MANIFEST.MF --- a/core/plugins/org.csstudio.logging.ui/META-INF/MANIFEST.MF Mon Feb 28 14:22:46 2011 -0500 +++ b/core/plugins/org.csstudio.logging.ui/META-INF/MANIFEST.MF Mon Feb 28 15:07:14 2011 -0500 @@ -7,10 +7,10 @@ Bundle-Vendor: Kay Kasemir <kas...@or...> - SNS Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Localization: plugin -Require-Bundle: org.eclipse.osgi;bundle-version="3.6.1", +Require-Bundle: org.eclipse.osgi;bundle-version="3.6.0", org.eclipse.equinox.preferences;bundle-version="3.3.0", - org.eclipse.jface;bundle-version="3.6.1", - org.eclipse.ui.workbench;bundle-version="3.6.1", + org.eclipse.jface;bundle-version="3.6.0", + org.eclipse.ui.workbench;bundle-version="3.6.0", org.eclipse.ui.console;bundle-version="3.5.0", org.csstudio.logging;bundle-version="0.0.1" Export-Package: org.csstudio.logging.ui diff -r 17aaf3abde33 -r 6b2ac34b5543 core/plugins/org.csstudio.logging/META-INF/MANIFEST.MF --- a/core/plugins/org.csstudio.logging/META-INF/MANIFEST.MF Mon Feb 28 14:22:46 2011 -0500 +++ b/core/plugins/org.csstudio.logging/META-INF/MANIFEST.MF Mon Feb 28 15:07:14 2011 -0500 @@ -7,7 +7,7 @@ Bundle-Vendor: Kay Kasemir <kas...@or...> - SNS Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.junit4;bundle-version="4.8.1", - org.eclipse.osgi;bundle-version="3.6.1", + org.eclipse.osgi;bundle-version="3.6.0", org.eclipse.core.runtime;bundle-version="3.6.0", org.csstudio.platform.libs.jms;bundle-version="1.1.1" Export-Package: org.csstudio.logging |