Author: linus
Date: 2007-08-20 22:35:36-0700
New Revision: 13423
Modified:
trunk/documentation/cookbook/building.xml
trunk/documentation/cookbook/inside_subsystems.xml
trunk/documentation/cookbook/standard.xml
Log:
Updated to remove java 1.4.
Some spelling errors corrected.
Modified: trunk/documentation/cookbook/building.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/documentation/cookbook/building.xml?view=diff&rev=13423&p1=trunk/documentation/cookbook/building.xml&p2=trunk/documentation/cookbook/building.xml&r1=13422&r2=13423
==============================================================================
--- trunk/documentation/cookbook/building.xml (original)
+++ trunk/documentation/cookbook/building.xml 2007-08-20 22:35:36-0700
@@ -28,7 +28,8 @@
<chapter id="buildingandtools">
<title>Building from source</title>
<para>
-Building ArgoUML from source requires a SVN client, a current JDK (1.4 or later),
+Building ArgoUML from source requires a SVN client,
+a current JDK (Java5 or later),
and 350MB of free disk space.
All other tools, including the Ant build tool upon which
the build is based, are included in the project source tree.
@@ -60,7 +61,7 @@
A newly compiled ArgoUML will open in a new window.
</para>
<note>
- <para>JDK 1.4 or later is required</para>
+ <para>JDK Java5 or later is required</para>
</note>
<para>
That was the compact version for Windows + JDK.
@@ -132,7 +133,7 @@
</listitem>
<listitem>
<para>
-JDK, at least version 1.4.2 (includes the Java compiler)
+JDK (including the Java compiler)
</para>
</listitem>
</itemizedlist>
@@ -1325,7 +1326,7 @@
<command>build tests</command>
the
<constant>java.awt.headless</constant> is set to true.
-This means that awk is started in a mode that disallows actual presentation
+This means that awt is started in a mode that disallows actual presentation
so no windows will be opened.
On any attempt to realize a window a JavaHeadlessException is thrown making
the test case fail.
@@ -1517,7 +1518,7 @@
<sect2>
<title>Improving a test case</title>
<para>
-Testcases are better if they are simpler.
+Test cases are better if they are simpler.
Strive to involve as little part of the ArgoUML code as possible.
Ideally you are just testing a single class at the time.
</para>
@@ -1549,13 +1550,13 @@
compile-time dependency settings and we don't have MDR in the
compile-time dependencies because we want to enforce that there
is no such dependency.
-Hopefully an upcoming code reorganisation will address this problem.
+Hopefully an upcoming code reorganization will address this problem.
</para>
<para>
The simplest way is to create/run the JUnit test configuration
and if it fails with a ExceptionInInitializer error open it with
the Configuration editor, add the argouml-core-model-mdr project
-to the classpath and then run again.
+to the class path and then run again.
</para>
</footnote>
</para>
@@ -2093,22 +2094,17 @@
Then select
Java => Compiler.
At the right hand side set
-Compiler compliance level: 1.4.
+Compiler compliance level: 5.0.
</para>
<para>
-Uncheck Use default complicance settings and set
-Generated .class file compatibility: 1.4,
-Source compatibility: 1.4,
-and Disallow identifiers called enum to Error.
+Check Use default compliance settings.
</para>
<para>
-In the ArgoUML project we have decided to keep source compliance to JDK 1.4.
+In the ArgoUML project we have decided to keep source compliance to Java5
(See <xref linkend="REQ7"/>).
This setting enables Eclipse to tell you where some
-JDK 1.5
+Java6
features have crept in.
-At the same time we don't want to introduce identifiers that are in conflict
-with Java5.
</para>
</listitem>
@@ -2371,7 +2367,7 @@
<listitem>
<para>
-Add the argouml-core-model-mdr to the classpath.
+Add the argouml-core-model-mdr to the class path.
</para>
<para>
@@ -2425,7 +2421,7 @@
</para>
<para>
Since we have an Eclipse setup with a mismatch between the
-compile time dependenies and the run time dependencies
+compile time dependencies and the run time dependencies
this Configuration contains references to specific jar-files.
This means a maintenance problem whenever changing version of
a dependency.
@@ -2468,7 +2464,7 @@
<listitem>
<para>
-On the multilevel popup that opens, select
+On the multilevel pop-up that opens, select
Run As... JUnit Test or
Debug As... JUnit Test.
</para>
@@ -2502,7 +2498,7 @@
</listitem>
<listitem>
<para>
-Add the argouml-core-model-mdr project to the classpath.
+Add the argouml-core-model-mdr project to the class path.
</para>
<para>
This is done by:
@@ -2671,7 +2667,7 @@
The machine needs
Internet access (it is not a small download and upload so at least
128KB Internet connection to keep the time reasonable < 2 hours),
-the correct version of Java installed (should be a JDK 1.4.2),
+the correct version of Java installed (should be a JDK for Java5),
SVN installed,
Unix or Cygwin to be able to run the scripts.
</para>
@@ -2680,7 +2676,7 @@
<listitem>
<para>
The argoumlinstaller and argouml-downloads projects checked out
-alongside eachother.
+alongside each other.
</para>
<para>
@@ -2799,7 +2795,7 @@
<listitem>
<para>
-Build ArgoUML and the subprojects,
+Build ArgoUML and the sub-projects,
and sign the jar files.
</para>
<para>
Modified: trunk/documentation/cookbook/inside_subsystems.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/documentation/cookbook/inside_subsystems.xml?view=diff&rev=13423&p1=trunk/documentation/cookbook/inside_subsystems.xml&p2=trunk/documentation/cookbook/inside_subsystems.xml&r1=13422&r2=13423
==============================================================================
--- trunk/documentation/cookbook/inside_subsystems.xml (original)
+++ trunk/documentation/cookbook/inside_subsystems.xml 2007-08-20 22:35:36-0700
@@ -184,9 +184,9 @@
<classname>org.argouml.language</classname>.
In the case of languages
other than Java, these classes will come from independent projects and
- be package separately even though they share this package namespace.
+ be package separately even though they share this package name space.
<warning>NOTE: There is a potential conflict here if two separately
- language implementations use this namespace in an uncoordinated fashion
+ language implementations use this name space in an uncoordinated fashion
(e.g. two Ruby implementations using org.argouml.language.ruby).
</warning>
</para>
@@ -428,7 +428,7 @@
</para>
<para>Via an event mechanism this manager makes sure
that all objects interested
- in knowing wether the selection changed are acknowledged.
+ in knowing whether the selection changed are acknowledged.
</para>
<para>The TargetManager does not depend on the
<classname>org.argouml.ui</classname> package,
@@ -658,7 +658,7 @@
<listitem>
<para> R7: copy diagram to clipboard functionality for
- windows/java 1.4 users. </para>
+ windows/java5 users. </para>
</listitem>
<listitem>
Modified: trunk/documentation/cookbook/standard.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/documentation/cookbook/standard.xml?view=diff&rev=13423&p1=trunk/documentation/cookbook/standard.xml&p2=trunk/documentation/cookbook/standard.xml&r1=13422&r2=13423
==============================================================================
--- trunk/documentation/cookbook/standard.xml (original)
+++ trunk/documentation/cookbook/standard.xml 2007-08-20 22:35:36-0700
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!-- $Id$ -->
<!--
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -118,7 +118,7 @@
<para>
If you are overriding or implementing a method and
you want to describe specifics of the implementation,
-use the javadoc and reference the overridden or implemented method.
+use the Javadoc and reference the overridden or implemented method.
</para>
<para>
This is not required by the Sun Code Conventions but
@@ -199,7 +199,7 @@
Whenever you have a public or protected method or attribute in a class or
a public class
that you want to
-remove, rename, move to a different pacakge,
+remove, rename, move to a different package,
change the signature in an incompatible way, or
reduce the visibility for
you shall always deprecate it first.
@@ -675,7 +675,7 @@
Java is still under development and there are nice features available in
future releases.
In ArgoUML we have a plan for how to handle this. It is to always support
-two major releases of Java (currently JDK 1.4 and 1.5).
+two major releases of Java (currently Java5 and Java6).
We cannot have a dependency that restricts us in this aspect.
</para>
</listitem>
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.