Skip to content

unescape UTF-8 literals in Java source code #729

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jburel merged 2 commits into from
Feb 18, 2013
Merged

unescape UTF-8 literals in Java source code #729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c585b9a
Use UTF-8 literals in Java source code.
mtbc Feb 13, 2013
5d5ba04
Set javac encoding in Insight child build files.
mtbc Feb 14, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions components/antlib/resources/lifecycle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ omero.version=${omero.version}
sourcepath=""
source="${javac.source}"
target="${javac.target}"
encoding="UTF-8"
debug="${javac.debug}"
debuglevel="${javac.debuglevel}"
deprecation="on"
Expand Down Expand Up @@ -210,6 +211,7 @@ omero.version=${omero.version}
fork="yes"
debug="on"
destdir="${testclasses.dir}"
encoding="UTF-8"
classpathref="omero.test.classpath" >
<src path="${test.dir}"/>
</javac>
Expand Down
2 changes: 1 addition & 1 deletion components/insight/SRC/org/openmicroscopy/shoola/agents/imviewer/browser/InfoPane.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class InfoPane
{

/** String to represent the micron symbol. */
private static final String MICRONS = "(in \u00B5)";
private static final String MICRONS = "(in µ)";

/** Identifies the <code>SizeX</code> field. */
private static final String SIZE_X = "Size X";
Expand Down
15 changes: 10 additions & 5 deletions components/insight/SRC/org/openmicroscopy/shoola/agents/util/EditorUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,11 +198,16 @@ public class EditorUtil
/** String to represent the micron symbol. */
public static final String MICRONS = "("+UnitsObject.MICRONS+")";

/** String to represent the celcius symbol. */
public static final String CELCIUS = "(\u2103)";
/** String to represent the celsius symbol. */
public static final String CELSIUS = "(℃)";

/** String to represent the celsius symbol.
* @deprecated use {@link #CELSIUS} instead
*/
public static final String CELCIUS = CELSIUS;

/** String to represent the percent symbol. */
public static final String PERCENT = "(\u0025)";
public static final String PERCENT = "(%)";

/** String to represent the millibars symbol. */
public static final String MILLIBARS = "(mb)";
Expand Down Expand Up @@ -307,13 +312,13 @@ public class EditorUtil
public static final String REFRACTIVE_INDEX = "Refractive index";

/** Identifies the Environment <code>temperature</code> field. */
public static final String TEMPERATURE = "Temperature "+CELCIUS;
public static final String TEMPERATURE = "Temperature "+CELSIUS;

/** Identifies the Environment <code>Air pressure</code> field. */
public static final String AIR_PRESSURE = "Air Pressure "+MILLIBARS;

/** Identifies the Environment <code>Humidity</code> field. */
public static final String HUMIDITY = "Humidy "+PERCENT;
public static final String HUMIDITY = "Humidity "+PERCENT;

/** Identifies the Environment <code>CO2 Percent</code> field. */
public static final String CO2_PERCENT = "CO2 Percent "+PERCENT;
Expand Down
4 changes: 2 additions & 2 deletions components/insight/SRC/org/openmicroscopy/shoola/util/ui/UIUtilities.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,10 +231,10 @@ public class UIUtilities
public static final long DAY = 86400000;

/** Unicode for the squared symbol. */
public final static String SQUARED_SYMBOL = "\u00B2";
public final static String SQUARED_SYMBOL = "²";

/** Unicode for the squared symbol. */
public final static String DELTA_SYMBOL = "\u0394";
public final static String DELTA_SYMBOL = "Δ";

/** Pixels string. */
public final static String PIXELS_SYMBOL = "px";
Expand Down
6 changes: 3 additions & 3 deletions components/insight/SRC/org/openmicroscopy/shoola/util/ui/UnitsObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,19 +40,19 @@ public class UnitsObject
{

/** Unicode for the degrees symbol. */
public final static String DEGREES = "\u00B0";
public final static String DEGREES = "°";

/** String to represent the picometer symbol. */
public static final String PICOMETER = "pm";

/** String to represent the angstrom symbol. */
public static final String ANGSTROM = "\u00C5";
public static final String ANGSTROM = "Å";

/** String to represent the nanometer symbol. */
public static final String NANOMETER = "nm";

/** String to represent the micron symbol. */
public static final String MICRONS = "\u00B5m";
public static final String MICRONS = "µm";

/** String to represent the millimeter symbol. */
public static final String MILLIMETER = "mm";
Expand Down
55 changes: 29 additions & 26 deletions components/insight/build/app.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,41 +129,44 @@
* The app sources is the set of all files within ${base.src.dir} matching
* app.sources pattern. The classpath is set to ${app.compile.classpath}.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
<target name="compile"
depends="app-init"
<target name="compile"
depends="app-init"
description="Compile the whole app.">
<javac srcdir="${base.src.dir}" target="1.5"
source="1.5"
destdir="${app.compiled.dir}"
includeantruntime="no"
includeantruntime="no"
deprecation="yes"
encoding="UTF-8"
debug="yes"
debuglevel="lines,vars,source">
<classpath refid="app.compile.classpath"/>
<patternset refid="app.sources"/>
</javac>
<javac srcdir="${base.src.util.dir}" target="1.5"
source="1.5"
destdir="${app.compiled.util.dir}"
includeantruntime="no"
deprecation="yes"
debug="yes"
debuglevel="lines,vars,source">
<classpath refid="app.compile.classpath"/>
<patternset refid="app.sources"/>
</javac>
<javac srcdir="${base.src.svc.dir}" target="1.5"
source="1.5"
destdir="${app.compiled.util.dir}"
includeantruntime="no"
deprecation="yes"
debug="yes"
debuglevel="lines,vars,source">
<classpath refid="app.compile.classpath"/>
<patternset refid="app.sources"/>
</javac>
</target>

</javac>
<javac srcdir="${base.src.util.dir}" target="1.5"
source="1.5"
destdir="${app.compiled.util.dir}"
includeantruntime="no"
deprecation="yes"
encoding="UTF-8"
debug="yes"
debuglevel="lines,vars,source">
<classpath refid="app.compile.classpath"/>
<patternset refid="app.sources"/>
</javac>
<javac srcdir="${base.src.svc.dir}" target="1.5"
source="1.5"
destdir="${app.compiled.util.dir}"
includeantruntime="no"
deprecation="yes"
encoding="UTF-8"
debug="yes"
debuglevel="lines,vars,source">
<classpath refid="app.compile.classpath"/>
<patternset refid="app.sources"/>
</javac>
</target>

<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* Run the app in its own JVM.
* The location of the home directory is passed to the app via the command
Expand Down
13 changes: 7 additions & 6 deletions components/insight/build/test.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,17 +188,18 @@
* depends on app-init, we defer this check until compile has been called.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
<target name="test-compile" depends="test-init,compile">
<checkdef ref="app.run.classpath" />
<javac srcdir="${base.test.dir}"
<checkdef ref="app.run.classpath" />
<javac srcdir="${base.test.dir}"
destdir="${test.compiled.dir}"
includeantruntime="no"
includeantruntime="no"
deprecation="yes"
encoding="UTF-8"
debug="yes"
debuglevel="lines,vars,source">
<classpath refid="test.compile.classpath" />
<patternset refid="test.sources" />
</javac>
</target>
<patternset refid="test.sources" />
</javac>
</target>

<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* Run all tests, produce a report, and halt the build upon test failure.
Expand Down
3 changes: 2 additions & 1 deletion components/insight/build/tools/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@
destdir="${deploy.dir}"
target="1.2"
source="1.2"
includeantruntime="no"
includeantruntime="no"
encoding="UTF-8"
deprecation="yes"
debug="yes"
debuglevel="lines,vars,source" />
Expand Down
3 changes: 2 additions & 1 deletion components/insight/docgen/xdocs/navig/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@
description="Compile the applet.">
<javac srcdir="${src.dir}"
destdir="${compiled.dir}"
includeantruntime="no"
includeantruntime="no"
encoding="UTF-8"
deprecation="yes"
debug="yes"
debuglevel="lines,vars,source">
Expand Down