Context Navigation

← Previous Changeset
Next Changeset →

Changeset 5522

Timestamp:

06/24/08 19:45:46 (4 months ago)

Author:

jburel

Message:

Externalise version, name, about file etc.
Fixed tickect #621

Location:

trunk

Files:

: 8 modified

SRC/org/openmicroscopy/shoola/env/LookupNames.java (modified) (1 diff)
SRC/org/openmicroscopy/shoola/env/data/OMEROGateway.java (modified) (1 diff)
SRC/org/openmicroscopy/shoola/env/init/Initializer.java (modified) (3 diffs)
SRC/org/openmicroscopy/shoola/env/rnd/RenderingControlProxy.java (modified) (3 diffs)
SRC/org/openmicroscopy/shoola/env/ui/SoftwareUpdateDialog.java (modified) (1 diff)
SRC/org/openmicroscopy/shoola/env/ui/SplashScreenManager.java (modified) (1 diff)
SRC/org/openmicroscopy/shoola/env/ui/TaskBarManager.java (modified) (5 diffs)
config/container.xml (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

trunk/SRC/org/openmicroscopy/shoola/env/LookupNames.java

r5514	r5522
50	50	/** Field to access the <code>Version</code> information. */
51	51	public static final String VERSION = "Version";
	52
	53	/** Field to access the <code>Name oof the sofware</code>. */
	54	public static final String SOFTWARE_NAME = "SoftwareName";
	55
	56	/** Field to access the <code>About file</code> information. */
	57	public static final String ABOUT_FILE = "AboutFile";
52	58
53	59	/** Field to access the <code>env</code> package. */

trunk/SRC/org/openmicroscopy/shoola/env/data/OMEROGateway.java

r5519	r5522
161	161	WILD_CARDS.add("*");
162	162	WILD_CARDS.add("?");
	163	WILD_CARDS.add("~");
163	164	}
164	165

trunk/SRC/org/openmicroscopy/shoola/env/init/Initializer.java

r4778	r5522
75	75	*/
76	76	protected static final List<Class> initList = new ArrayList<Class>();
	77
77	78	static {
78	79	//This must be the first task to run b/c it will bring up
…	…
83	84	//(b/c it creates and fills up the container's config).
84	85	initList.add(ContainerConfigInit.class);
85
86	86	initList.add(LoggerInit.class);
87	87	initList.add(EventBusInit.class);
…	…
295	295	*
296	296	* @param subscriber The listener.
297		* @return <code>true</code> if <code>subscriber</code> is not already in
	297	* @return <code>true</code> if <code>subscriber</code> is not already in
298	298	* the notification set, <code>false</code> otherwise.
299	299	* @throws NullPointerException If <code>null</code> is passed in.

trunk/SRC/org/openmicroscopy/shoola/env/rnd/RenderingControlProxy.java

r5509	r5522
870	870	try {
871	871	servant.resetDefaultsNoSave();
	872	setModel(HSB);
872	873	invalidateCache();
873	874	initialize();
…	…
1223	1224	try {
1224	1225	servant.resetDefaultsNoSave();
	1226	setModel(HSB);
1225	1227	List list = servant.getAvailableFamilies();
1226	1228	ChannelMetadata m;
…	…
1240	1242	m.getGlobalMax());
1241	1243	}
	1244
1242	1245	invalidateCache();
1243	1246	initialize();

trunk/SRC/org/openmicroscopy/shoola/env/ui/SoftwareUpdateDialog.java

r5414	r5522
75	75	/** Bounds property indicating to launch the web site. */
76	76	static final String OPEN_URL_PROPERTY = "openURL";
77
78		~~/** The window's title. */~~
79		~~static final String TITLE_ABOUT = "About OMERO.insight...";~~
80
81		~~/** The window's title. */~~
82		~~static final String TITLE_UPDATE = "Update OMERO.insight...";~~
83	77
84	78	/** The close button. */

trunk/SRC/org/openmicroscopy/shoola/env/ui/SplashScreenManager.java

r5514	r5522
79	79
80	80	/** The title of the splash screens. */
81		static final String TITLE = "Open Microscopy Environment";
82
83		/** The client's version. */
84		//static final String VERSION = "Beta3.0";
85
	81	private static final String TITLE = "Open Microscopy Environment";
	82
86	83	/** The component's UI. */
87	84	private ScreenLogin view;

trunk/SRC/org/openmicroscopy/shoola/env/ui/TaskBarManager.java

r5414	r5522
85	85	{
86	86
87		/** The name of the about file in the config directory. */
88		private static final String ABOUT_FILE = "about.xml";
89
90		/** The name of the documentation file in the docs directory. */
91		private static final String DOC_FILE = "insight_index.html";
	87	/** The window's title. */
	88	static final String TITLE_ABOUT = "About";
92	89
93	90	/** The value of the tag to find. */
…	…
207	204	line = in.readLine();
208	205	if (line == null) break;
209		~~//buffer.append("\n");~~
210	206	if (number != 0) buffer.append(line);
211	207	number++;
…	…
214	210	message = buffer.toString();
215	211	} catch (Exception e) {
216		message = "Error: ~~About information not found~~";
	212	message = "Error: Cannot find the About file.";
217	213	}
218	214	return message;
…	…
410	406	{
411	407	//READ content of the about file.
412		String refFile = container.resolveConfigFile(ABOUT_FILE);
	408	String aboutFile = (String) container.getRegistry().lookup(
	409	LookupNames.ABOUT_FILE);
	410	String refFile = container.resolveConfigFile(aboutFile);
413	411	String message = loadAbout(refFile);
414
	412	String title = (String) container.getRegistry().lookup(
	413	LookupNames.SOFTWARE_NAME);
415	414	suDialog = new SoftwareUpdateDialog(view, message, refFile);
416		suDialog.setTitle(~~SoftwareUpdateDialog.TITLE_ABOUT~~);
	415	suDialog.setTitle(TITLE_ABOUT+title+"...");
417	416	suDialog.addPropertyChangeListener(
418	417	SoftwareUpdateDialog.OPEN_URL_PROPERTY, this);
…	…
423	422	private void help()
424	423	{
425		String path = "file://"+container.resolveDocFile(DOC_FILE);
426		openURL(path);
	424	//String path = "file://"+container.resolveDocFile(DOC_FILE);
	425	//openURL(path);
427	426	}
428	427

trunk/config/container.xml

r5514	r5522
233	233
234	234	<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
235		*
236		* ~~Version number of the client~~.
	235	* Information related to the version of the software, name of the software,
	236	* etc.
237	237	*
238	238	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
239	239	<entry name="Version">Beta3.0</entry>
	240	<entry name="SoftwareName">OMERO.insight</entry>
	241	<entry name="AboutFile">about.xml</entry>
240	242	</container>

Context Navigation

Changeset 5522

Legend:

Download in other formats: