Skip to content

Minor comment and string fixes. #721

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

Closed
mtbc wants to merge 2 commits into from
Closed

Minor comment and string fixes. #721

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
27d1403
Minor comment and string fixes.
mtbc Feb 11, 2013
33536ed
In ant, set Java source file encoding to UTF-8.
mtbc Feb 11, 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: 1 addition & 1 deletion components/antlib/resources/global.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,7 @@ with OMERO.
</macrodef>

<!--
The hard-wiring macro is used to allowcertain method interceptors to
The hard-wiring macro is used to allow certain method interceptors to
be hard-wired around method exception *before* any of the "soft"
spring-wired interceptors (see resources/ome/services/services.xml)

Expand Down
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/blitz/src/ome/services/blitz/repo/PublicRepositoryI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
import Ice.Current;

/**
* An implementation of he PublicRepository interface
* An implementation of the PublicRepository interface
*
* @author Colin Blackburn <cblackburn at dundee dot ac dot uk>
* @author Josh Moore, josh at glencoesoftware.com
Expand Down
3 changes: 2 additions & 1 deletion components/blitz/src/omero/util/TempFileManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,6 @@ protected void cleanTempDir() throws IOException {
* Attempts to delete all directories under self.userdir other than the one
* owned by this process. If a directory is locked, it is skipped.
*/
@SuppressWarnings("unchecked")
protected void cleanUserDir() throws IOException {
log.debug("Cleaning user dir: " + userDir.getAbsolutePath());
List<File> files = Arrays.asList(userDir.listFiles());
Expand All @@ -385,6 +384,8 @@ protected void cleanUserDir() throws IOException {
} catch (Exception e) {
System.out.println("Locked: " + f);
continue;
} finally {
Copy link
Member

@joshmoore joshmoore Feb 11, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't really fall under the description of this commit/PR. Probably fine, but do shoot for the principle of least surprise where possible.

Copy link
Member Author

@mtbc mtbc Feb 11, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point, I forgot I'd noticed this; adjusted description accordingly.

raf.close();
}
FileUtils.deleteDirectory(file);
System.out.println("Deleted: " + f);
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
10 changes: 5 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,11 @@ 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. */
Copy link
Member

@joshmoore joshmoore Feb 11, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changing the names of constants should really NOT be happening here.

Copy link
Member Author

@mtbc mtbc Feb 11, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There don't seem to be any references elsewhere, nor any obvious reason why there would be. Do you want me to leave the misspelling in, then? (Or have both, one deprecated?)

public static final String 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 +307,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
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
6 changes: 3 additions & 3 deletions etc/omero.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ omero.search.analyzer=ome.services.fulltext.FullTextAnalyzer
# Maximum number of OR-clauses to which a single search can expand
omero.search.maxclause=4096

# Indexing takes place on all EventLogs as the occur in the database.
# Indexing takes place on all EventLogs as they occur in the database.
# The types listed here will be skipped if they appear in the "entityType"
# field of the EventLog table.
omero.search.excludes=\
Expand All @@ -168,12 +168,12 @@ ome.model.screen.ScreenAcquisitionWellSampleLink,ome.model.screen.ScreenPlateLin
ome.model.stats.StatsInfo

# Extra bridge classes, comma-separated, to be invoked on each indexing.
# Bridges are used to parse more information out of the your data.
# Bridges are used to parse more information out of the data.
omero.search.bridges=

omero.search.locking_strategy=native

# Fore more information, see:
# For more information, see:
# http://trac.openmicroscopy.org.uk/ome/wiki/OmeroSearch

############################################
Expand Down