aboutsummaryrefslogtreecommitdiffstats
path: root/docs/dist
diff options
context:
space:
mode:
Diffstat (limited to 'docs/dist')
-rw-r--r--docs/dist/doc/examples/bean/BoundPoint.java37
-rw-r--r--docs/dist/doc/examples/bean/Demo.java79
-rw-r--r--docs/dist/doc/examples/bean/Point.java25
-rw-r--r--docs/dist/doc/examples/introduction/CloneablePoint.java2
-rw-r--r--docs/dist/doc/examples/observer/Button.java25
-rw-r--r--docs/dist/doc/examples/observer/ColorLabel.java20
-rw-r--r--docs/dist/doc/examples/observer/Demo.java23
-rw-r--r--docs/dist/doc/examples/observer/Display.java24
-rw-r--r--docs/dist/doc/examples/observer/Observer.java4
-rw-r--r--docs/dist/doc/examples/observer/Subject.java5
-rw-r--r--docs/dist/doc/examples/observer/SubjectObserverProtocol.java24
-rw-r--r--docs/dist/doc/examples/observer/SubjectObserverProtocolImpl.java13
-rw-r--r--docs/dist/doc/examples/telecom/Billing.java9
-rw-r--r--docs/dist/doc/examples/telecom/TimerLog.java6
-rw-r--r--docs/dist/doc/examples/telecom/Timing.java15
-rw-r--r--docs/dist/doc/examples/tjp/Demo.java17
-rw-r--r--docs/dist/doc/examples/tjp/GetInfo.java16
-rw-r--r--docs/dist/doc/examples/tracing/TwoDShape.java11
-rw-r--r--docs/dist/doc/examples/tracing/version1/Trace.java8
-rw-r--r--docs/dist/doc/examples/tracing/version1/TraceMyClasses.java8
-rw-r--r--docs/dist/doc/examples/tracing/version2/Trace.java10
-rw-r--r--docs/dist/doc/examples/tracing/version2/TraceMyClasses.java8
-rw-r--r--docs/dist/doc/quick.pdfbin22888 -> 24310 bytes
-rw-r--r--docs/dist/doc/quickA4.pdfbin0 -> 25152 bytes
24 files changed, 143 insertions, 246 deletions
diff --git a/docs/dist/doc/examples/bean/BoundPoint.java b/docs/dist/doc/examples/bean/BoundPoint.java
index c247ca9cd..e5d9ab8c6 100644
--- a/docs/dist/doc/examples/bean/BoundPoint.java
+++ b/docs/dist/doc/examples/bean/BoundPoint.java
@@ -10,19 +10,20 @@
* warranty about the software, its performance or its conformity to any
* specification.
*/
+
package bean;
import java.beans.*;
import java.io.Serializable;
/*
- * Add bound properties and serialization to point objects
+ * Add bound properties and serialization to point objects
*/
aspect BoundPoint {
/*
* privately introduce a field into Point to hold the property
- * change support object. `this' is a reference to a Point object.
+ * change support object. `this' is a reference to a Point object.
*/
private PropertyChangeSupport Point.support = new PropertyChangeSupport(this);
@@ -34,13 +35,13 @@ aspect BoundPoint {
support.addPropertyChangeListener(listener);
}
- public void Point.addPropertyChangeListener(String propertyName,
+ public void Point.addPropertyChangeListener(String propertyName,
PropertyChangeListener listener){
-
+
support.addPropertyChangeListener(propertyName, listener);
}
- public void Point.removePropertyChangeListener(String propertyName,
+ public void Point.removePropertyChangeListener(String propertyName,
PropertyChangeListener listener) {
support.removePropertyChangeListener(propertyName, listener);
}
@@ -63,31 +64,31 @@ aspect BoundPoint {
/**
* Advice to get the property change event fired when the
- * setters are called. It's around advice because you need
+ * setters are called. It's around advice because you need
* the old value of the property.
*/
void around(Point p): setter(p) {
- String propertyName =
+ String propertyName =
thisJoinPointStaticPart.getSignature().getName().substring("set".length());
- int oldX = p.getX();
- int oldY = p.getY();
- proceed(p);
- if (propertyName.equals("X")){
+ int oldX = p.getX();
+ int oldY = p.getY();
+ proceed(p);
+ if (propertyName.equals("X")){
firePropertyChange(p, propertyName, oldX, p.getX());
- } else {
+ } else {
firePropertyChange(p, propertyName, oldY, p.getY());
- }
+ }
}
/*
* Utility to fire the property change event.
*/
- void firePropertyChange(Point p,
- String property,
- double oldval,
+ void firePropertyChange(Point p,
+ String property,
+ double oldval,
double newval) {
- p.support.firePropertyChange(property,
- new Double(oldval),
+ p.support.firePropertyChange(property,
+ new Double(oldval),
new Double(newval));
}
}
diff --git a/docs/dist/doc/examples/bean/Demo.java b/docs/dist/doc/examples/bean/Demo.java
index 767409878..e16be245e 100644
--- a/docs/dist/doc/examples/bean/Demo.java
+++ b/docs/dist/doc/examples/bean/Demo.java
@@ -1,13 +1,12 @@
/*
-
Copyright (c) Xerox Corporation 1998-2002. All rights reserved.
Use and copying of this software and preparation of derivative works based
upon this software are permitted. Any distribution of this software or
derivative works must comply with all applicable United States export control
laws.
-
*/
+
package bean;
import java.beans.*;
@@ -22,62 +21,60 @@ public class Demo implements PropertyChangeListener {
* this method reports that a propery has changed
*/
public void propertyChange(PropertyChangeEvent e){
- System.out.println("Property " + e.getPropertyName() + " changed from " +
- e.getOldValue() + " to " + e.getNewValue() );
+ System.out.println("Property " + e.getPropertyName() + " changed from " +
+ e.getOldValue() + " to " + e.getNewValue() );
}
/**
* main: test the program
*/
public static void main(String[] args){
- Point p1 = new Point();
- p1.addPropertyChangeListener(new Demo());
- System.out.println("p1 =" + p1);
- p1.setRectangular(5,2);
- System.out.println("p1 =" + p1);
- p1.setX( 6 );
- p1.setY( 3 );
- System.out.println("p1 =" + p1);
- p1.offset(6,4);
- System.out.println("p1 =" + p1);
- save(p1, fileName);
- Point p2 = (Point) restore(fileName);
- System.out.println("Had: " + p1);
- System.out.println("Got: " + p2);
+ Point p1 = new Point();
+ p1.addPropertyChangeListener(new Demo());
+ System.out.println("p1 =" + p1);
+ p1.setRectangular(5,2);
+ System.out.println("p1 =" + p1);
+ p1.setX( 6 );
+ p1.setY( 3 );
+ System.out.println("p1 =" + p1);
+ p1.offset(6,4);
+ System.out.println("p1 =" + p1);
+ save(p1, fileName);
+ Point p2 = (Point) restore(fileName);
+ System.out.println("Had: " + p1);
+ System.out.println("Got: " + p2);
}
/**
* Save a serializable object to a file
*/
static void save(Serializable p, String fn){
- try {
- System.out.println("Writing to file: " + p);
- FileOutputStream fo = new FileOutputStream(fn);
- ObjectOutputStream so = new ObjectOutputStream(fo);
- so.writeObject(p);
- so.flush();
- } catch (Exception e) {
- System.out.println(e);
- System.exit(1);
- }
+ try {
+ System.out.println("Writing to file: " + p);
+ FileOutputStream fo = new FileOutputStream(fn);
+ ObjectOutputStream so = new ObjectOutputStream(fo);
+ so.writeObject(p);
+ so.flush();
+ } catch (Exception e) {
+ System.out.println(e);
+ System.exit(1);
+ }
}
/**
* Restore a serializable object from the file
*/
static Object restore(String fn){
- try {
- Object result;
- System.out.println("Reading from file: " + fn);
- FileInputStream fi = new FileInputStream(fn);
- ObjectInputStream si = new ObjectInputStream(fi);
- return si.readObject();
- } catch (Exception e) {
- System.out.println(e);
- System.exit(1);
- }
- return null;
+ try {
+ Object result;
+ System.out.println("Reading from file: " + fn);
+ FileInputStream fi = new FileInputStream(fn);
+ ObjectInputStream si = new ObjectInputStream(fi);
+ return si.readObject();
+ } catch (Exception e) {
+ System.out.println(e);
+ System.exit(1);
+ }
+ return null;
}
-
-
}
diff --git a/docs/dist/doc/examples/bean/Point.java b/docs/dist/doc/examples/bean/Point.java
index d5040c2bf..a6ea703cd 100644
--- a/docs/dist/doc/examples/bean/Point.java
+++ b/docs/dist/doc/examples/bean/Point.java
@@ -1,5 +1,4 @@
/*
-
Copyright (c) Xerox Corporation 1998-2002. All rights reserved.
Use and copying of this software and preparation of derivative works based
@@ -9,7 +8,6 @@ laws.
This software is made available AS IS, and Xerox Corporation makes no warranty
about the software, its performance or its conformity to any specification.
-
*/
package bean;
@@ -23,54 +21,49 @@ class Point {
* Return the X coordinate
*/
public int getX(){
- return x;
+ return x;
}
/**
* Return the y coordinate
*/
public int getY(){
- return y;
+ return y;
}
/**
* Set the x and y coordinates
*/
public void setRectangular(int newX, int newY){
- setX(newX);
- setY(newY);
+ setX(newX);
+ setY(newY);
}
/**
* Set the X coordinate
*/
public void setX(int newX) {
- x = newX;
+ x = newX;
}
/**
* set the y coordinate
*/
public void setY(int newY) {
- y = newY;
+ y = newY;
}
-
/**
* Move the point by the specified x and y offset
*/
public void offset(int deltaX, int deltaY){
- setRectangular(x + deltaX, y + deltaY);
+ setRectangular(x + deltaX, y + deltaY);
}
-
/**
- * MAke a string of this
+ * Make a string of this
*/
public String toString(){
- return "(" + getX() + ", " + getY() + ")" ;
+ return "(" + getX() + ", " + getY() + ")" ;
}
-
-
-
}
diff --git a/docs/dist/doc/examples/introduction/CloneablePoint.java b/docs/dist/doc/examples/introduction/CloneablePoint.java
index 85fa4faf0..c34509850 100644
--- a/docs/dist/doc/examples/introduction/CloneablePoint.java
+++ b/docs/dist/doc/examples/introduction/CloneablePoint.java
@@ -30,7 +30,7 @@ public aspect CloneablePoint {
p1.setPolar(Math.PI, 1.0);
try {
- p2 = (Point)p1.clone();
+ p2 = (Point)p1.clone();
} catch (CloneNotSupportedException e) {}
System.out.println("p1 =" + p1 );
System.out.println("p2 =" + p2 );
diff --git a/docs/dist/doc/examples/observer/Button.java b/docs/dist/doc/examples/observer/Button.java
index 086a89e24..79b33caa9 100644
--- a/docs/dist/doc/examples/observer/Button.java
+++ b/docs/dist/doc/examples/observer/Button.java
@@ -1,5 +1,4 @@
/*
-
Copyright (c) Xerox Corporation 1998-2002. All rights reserved.
Use and copying of this software and preparation of derivative works based
@@ -9,9 +8,6 @@ laws.
This software is made available AS IS, and Xerox Corporation makes no warranty
about the software, its performance or its conformity to any specification.
-
-Button.java
-
*/
@@ -28,18 +24,17 @@ class Button extends java.awt.Button {
static final String defaultText = "cycle color";
Button(Display display) {
- super();
- setLabel(defaultText);
- setBackground(defaultBackgroundColor);
- setForeground(defaultForegroundColor);
- addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- Button.this.click();
- }
- });
- display.addToFrame(this);
+ super();
+ setLabel(defaultText);
+ setBackground(defaultBackgroundColor);
+ setForeground(defaultForegroundColor);
+ addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ Button.this.click();
+ }
+ });
+ display.addToFrame(this);
}
public void click() {}
-
}
diff --git a/docs/dist/doc/examples/observer/ColorLabel.java b/docs/dist/doc/examples/observer/ColorLabel.java
index 7b0c05fc9..5709545f2 100644
--- a/docs/dist/doc/examples/observer/ColorLabel.java
+++ b/docs/dist/doc/examples/observer/ColorLabel.java
@@ -1,5 +1,4 @@
/*
-
Copyright (c) Xerox Corporation 1998-2002. All rights reserved.
Use and copying of this software and preparation of derivative works based
@@ -9,9 +8,6 @@ laws.
This software is made available AS IS, and Xerox Corporation makes no warranty
about the software, its performance or its conformity to any specification.
-
-ColorLabel.java
-
*/
package observer;
@@ -21,20 +17,18 @@ import java.awt.Label;
class ColorLabel extends Label {
ColorLabel(Display display) {
- super();
- display.addToFrame(this);
+ super();
+ display.addToFrame(this);
}
final static Color[] colors = {Color.red, Color.blue,
- Color.green, Color.magenta};
+ Color.green, Color.magenta};
private int colorIndex = 0;
private int cycleCount = 0;
void colorCycle() {
- cycleCount++;
- colorIndex = (colorIndex + 1) % colors.length;
- setBackground(colors[colorIndex]);
- setText("" + cycleCount);
+ cycleCount++;
+ colorIndex = (colorIndex + 1) % colors.length;
+ setBackground(colors[colorIndex]);
+ setText("" + cycleCount);
}
}
-
-
diff --git a/docs/dist/doc/examples/observer/Demo.java b/docs/dist/doc/examples/observer/Demo.java
index b25552478..03be6a614 100644
--- a/docs/dist/doc/examples/observer/Demo.java
+++ b/docs/dist/doc/examples/observer/Demo.java
@@ -1,5 +1,4 @@
/*
-
Copyright (c) Xerox Corporation 1998-2002. All rights reserved.
Use and copying of this software and preparation of derivative works based
@@ -9,9 +8,6 @@ laws.
This software is made available AS IS, and Xerox Corporation makes no warranty
about the software, its performance or its conformity to any specification.
-
-Demo.java
-
*/
package observer;
@@ -19,16 +15,15 @@ package observer;
public class Demo {
public static void main(String[] args) {
- Display display = new Display();
- Button b1 = new Button(display);
- Button b2 = new Button(display);
- ColorLabel c1 = new ColorLabel(display);
- ColorLabel c2 = new ColorLabel(display);
- ColorLabel c3 = new ColorLabel(display);
+ Display display = new Display();
+ Button b1 = new Button(display);
+ Button b2 = new Button(display);
+ ColorLabel c1 = new ColorLabel(display);
+ ColorLabel c2 = new ColorLabel(display);
+ ColorLabel c3 = new ColorLabel(display);
- b1.addObserver(c1);
- b1.addObserver(c2);
- b2.addObserver(c3);
+ b1.addObserver(c1);
+ b1.addObserver(c2);
+ b2.addObserver(c3);
}
}
-
diff --git a/docs/dist/doc/examples/observer/Display.java b/docs/dist/doc/examples/observer/Display.java
index d7f4d479c..67ed2cb5b 100644
--- a/docs/dist/doc/examples/observer/Display.java
+++ b/docs/dist/doc/examples/observer/Display.java
@@ -1,5 +1,4 @@
/*
-
Copyright (c) Xerox Corporation 1998-2002. All rights reserved.
Use and copying of this software and preparation of derivative works based
@@ -9,9 +8,6 @@ laws.
This software is made available AS IS, and Xerox Corporation makes no warranty
about the software, its performance or its conformity to any specification.
-
-Display.java
-
*/
package observer;
@@ -34,19 +30,17 @@ class Display extends Panel {
protected Frame frame = new Frame("Subject/Observer Demo");
Display() {
- frame.addWindowListener(new WindowAdapter() {
- public void windowClosing(WindowEvent e) {System.exit(0);}
- });
+ frame.addWindowListener(new WindowAdapter() {
+ public void windowClosing(WindowEvent e) {System.exit(0);}
+ });
- frame.add(this, BorderLayout.CENTER);
- frame.pack();
- frame.setVisible(true);
+ frame.add(this, BorderLayout.CENTER);
+ frame.pack();
+ frame.setVisible(true);
}
void addToFrame(Component c) {
- add(c);
- frame.pack();
- }
+ add(c);
+ frame.pack();
+ }
}
-
-
diff --git a/docs/dist/doc/examples/observer/Observer.java b/docs/dist/doc/examples/observer/Observer.java
index 58ae44916..2851ebe17 100644
--- a/docs/dist/doc/examples/observer/Observer.java
+++ b/docs/dist/doc/examples/observer/Observer.java
@@ -1,5 +1,4 @@
/*
-
Copyright (c) Xerox Corporation 1998-2002. All rights reserved.
Use and copying of this software and preparation of derivative works based
@@ -9,9 +8,6 @@ laws.
This software is made available AS IS, and Xerox Corporation makes no warranty
about the software, its performance or its conformity to any specification.
-
-Observer.java
-
*/
package observer;
diff --git a/docs/dist/doc/examples/observer/Subject.java b/docs/dist/doc/examples/observer/Subject.java
index 5d80b1e09..d6c144e38 100644
--- a/docs/dist/doc/examples/observer/Subject.java
+++ b/docs/dist/doc/examples/observer/Subject.java
@@ -1,5 +1,4 @@
/*
-
Copyright (c) Xerox Corporation 1998-2002. All rights reserved.
Use and copying of this software and preparation of derivative works based
@@ -9,10 +8,8 @@ laws.
This software is made available AS IS, and Xerox Corporation makes no warranty
about the software, its performance or its conformity to any specification.
-
-Subject.java
-
*/
+
package observer;
import java.util.Vector;
diff --git a/docs/dist/doc/examples/observer/SubjectObserverProtocol.java b/docs/dist/doc/examples/observer/SubjectObserverProtocol.java
index 73f730e09..05e54d76c 100644
--- a/docs/dist/doc/examples/observer/SubjectObserverProtocol.java
+++ b/docs/dist/doc/examples/observer/SubjectObserverProtocol.java
@@ -1,5 +1,4 @@
/*
-
Copyright (c) Xerox Corporation 1998-2002. All rights reserved.
Use and copying of this software and preparation of derivative works based
@@ -9,9 +8,6 @@ laws.
This software is made available AS IS, and Xerox Corporation makes no warranty
about the software, its performance or its conformity to any specification.
-
-SubjectObserverProtocol.java
-
*/
package observer;
@@ -23,25 +19,23 @@ abstract aspect SubjectObserverProtocol {
abstract pointcut stateChanges(Subject s);
after(Subject s): stateChanges(s) {
- for (int i = 0; i < s.getObservers().size(); i++) {
- ((Observer)s.getObservers().elementAt(i)).update();
- }
+ for (int i = 0; i < s.getObservers().size(); i++) {
+ ((Observer)s.getObservers().elementAt(i)).update();
+ }
}
private Vector Subject.observers = new Vector();
- public void Subject.addObserver(Observer obs) {
- observers.addElement(obs);
- obs.setSubject(this);
+ public void Subject.addObserver(Observer obs) {
+ observers.addElement(obs);
+ obs.setSubject(this);
}
- public void Subject.removeObserver(Observer obs) {
- observers.removeElement(obs);
- obs.setSubject(null);
+ public void Subject.removeObserver(Observer obs) {
+ observers.removeElement(obs);
+ obs.setSubject(null);
}
public Vector Subject.getObservers() { return observers; }
private Subject Observer.subject = null;
public void Observer.setSubject(Subject s) { subject = s; }
public Subject Observer.getSubject() { return subject; }
-
}
-
diff --git a/docs/dist/doc/examples/observer/SubjectObserverProtocolImpl.java b/docs/dist/doc/examples/observer/SubjectObserverProtocolImpl.java
index 01f0c38fc..2bc75918c 100644
--- a/docs/dist/doc/examples/observer/SubjectObserverProtocolImpl.java
+++ b/docs/dist/doc/examples/observer/SubjectObserverProtocolImpl.java
@@ -1,5 +1,4 @@
/*
-
Copyright (c) Xerox Corporation 1998-2002. All rights reserved.
Use and copying of this software and preparation of derivative works based
@@ -9,9 +8,6 @@ laws.
This software is made available AS IS, and Xerox Corporation makes no warranty
about the software, its performance or its conformity to any specification.
-
-SubjectObserverProtocolImpl.java
-
*/
package observer;
@@ -25,12 +21,11 @@ aspect SubjectObserverProtocolImpl extends SubjectObserverProtocol {
declare parents: ColorLabel implements Observer;
public void ColorLabel.update() {
- colorCycle();
+ colorCycle();
}
- pointcut stateChanges(Subject s):
- target(s) &&
- call(void Button.click());
+ pointcut stateChanges(Subject s):
+ target(s) &&
+ call(void Button.click());
}
-
diff --git a/docs/dist/doc/examples/telecom/Billing.java b/docs/dist/doc/examples/telecom/Billing.java
index a87d73998..651d64b36 100644
--- a/docs/dist/doc/examples/telecom/Billing.java
+++ b/docs/dist/doc/examples/telecom/Billing.java
@@ -1,5 +1,4 @@
/*
-
Copyright (c) Xerox Corporation 1998-2002. All rights reserved.
Use and copying of this software and preparation of derivative works based
@@ -9,11 +8,6 @@ laws.
This software is made available AS IS, and Xerox Corporation makes no warranty
about the software, its performance or its conformity to any specification.
-
-|<--- this code is formatted to fit into 80 columns --->|
-|<--- this code is formatted to fit into 80 columns --->|
-|<--- this code is formatted to fit into 80 columns --->|
-
*/
package telecom;
@@ -29,13 +23,12 @@ package telecom;
* it depends only on timing and on the type of the connection.
*/
public aspect Billing {
- // domination required to get advice on endtiming in the right order
+ // precedence required to get advice on endtiming in the right order
declare precedence: Billing, Timing;
public static final long LOCAL_RATE = 3;
public static final long LONG_DISTANCE_RATE = 10;
-
public Customer Connection.payer;
public Customer getPayer(Connection conn) { return conn.payer; }
/**
diff --git a/docs/dist/doc/examples/telecom/TimerLog.java b/docs/dist/doc/examples/telecom/TimerLog.java
index 4591894dc..c736625b5 100644
--- a/docs/dist/doc/examples/telecom/TimerLog.java
+++ b/docs/dist/doc/examples/telecom/TimerLog.java
@@ -1,5 +1,4 @@
/*
-
Copyright (c) Xerox Corporation 1998-2002. All rights reserved.
Use and copying of this software and preparation of derivative works based
@@ -9,11 +8,6 @@ laws.
This software is made available AS IS, and Xerox Corporation makes no warranty
about the software, its performance or its conformity to any specification.
-
-|<--- this code is formatted to fit into 80 columns --->|
-|<--- this code is formatted to fit into 80 columns --->|
-|<--- this code is formatted to fit into 80 columns --->|
-
*/
package telecom;
diff --git a/docs/dist/doc/examples/telecom/Timing.java b/docs/dist/doc/examples/telecom/Timing.java
index f40bd0fca..29eba02ea 100644
--- a/docs/dist/doc/examples/telecom/Timing.java
+++ b/docs/dist/doc/examples/telecom/Timing.java
@@ -1,5 +1,4 @@
/*
-
Copyright (c) Xerox Corporation 1998-2002. All rights reserved.
Use and copying of this software and preparation of derivative works based
@@ -9,12 +8,8 @@ laws.
This software is made available AS IS, and Xerox Corporation makes no warranty
about the software, its performance or its conformity to any specification.
-
-|<--- this code is formatted to fit into 80 columns --->|
-|<--- this code is formatted to fit into 80 columns --->|
-|<--- this code is formatted to fit into 80 columns --->|
-
*/
+
package telecom;
/**
@@ -28,9 +23,9 @@ public aspect Timing {
* Every Customer has a total connection time
*/
public long Customer.totalConnectTime = 0;
-
- public long getTotalConnectTime(Customer cust) {
- return cust.totalConnectTime;
+
+ public long getTotalConnectTime(Customer cust) {
+ return cust.totalConnectTime;
}
/**
* Every connection has a timer
@@ -48,7 +43,7 @@ public aspect Timing {
/**
* When to stop the timer
*/
- pointcut endTiming(Connection c): target(c) &&
+ pointcut endTiming(Connection c): target(c) &&
call(void Connection.drop());
/**
diff --git a/docs/dist/doc/examples/tjp/Demo.java b/docs/dist/doc/examples/tjp/Demo.java
index 8b90a7a49..64d249c82 100644
--- a/docs/dist/doc/examples/tjp/Demo.java
+++ b/docs/dist/doc/examples/tjp/Demo.java
@@ -14,27 +14,24 @@ about the software, its performance or its conformity to any specification.
package tjp;
public class Demo {
-
static Demo d;
public static void main(String[] args){
- new Demo().go();
+ new Demo().go();
}
void go(){
- d = new Demo();
- d.foo(1,d);
- System.out.println(d.bar(new Integer(3)));
+ d = new Demo();
+ d.foo(1,d);
+ System.out.println(d.bar(new Integer(3)));
}
void foo(int i, Object o){
- System.out.println("Demo.foo(" + i + ", " + o + ")\n");
+ System.out.println("Demo.foo(" + i + ", " + o + ")\n");
}
-
String bar (Integer j){
- System.out.println("Demo.bar(" + j + ")\n");
- return "Demo.bar(" + j + ")";
+ System.out.println("Demo.bar(" + j + ")\n");
+ return "Demo.bar(" + j + ")";
}
-
}
diff --git a/docs/dist/doc/examples/tjp/GetInfo.java b/docs/dist/doc/examples/tjp/GetInfo.java
index 63f13c74e..0d38a3766 100644
--- a/docs/dist/doc/examples/tjp/GetInfo.java
+++ b/docs/dist/doc/examples/tjp/GetInfo.java
@@ -1,4 +1,4 @@
-/*
+/*
Copyright (c) Xerox Corporation 1998-2002. All rights reserved.
Use and copying of this software and preparation of derivative works based
@@ -24,10 +24,10 @@ aspect GetInfo {
pointcut demoExecs(): within(Demo) && execution(* *(..));
Object around(): demoExecs() && !execution(* go()) && goCut() {
- println("Intercepted message: " +
- thisJoinPointStaticPart.getSignature().getName());
- println("in class: " +
- thisJoinPointStaticPart.getSignature().getDeclaringType().getName());
+ println("Intercepted message: " +
+ thisJoinPointStaticPart.getSignature().getName());
+ println("in class: " +
+ thisJoinPointStaticPart.getSignature().getDeclaringType().getName());
printParameters(thisJoinPoint);
println("Running original method: \n" );
Object result = proceed();
@@ -41,9 +41,9 @@ aspect GetInfo {
String[] names = ((CodeSignature)jp.getSignature()).getParameterNames();
Class[] types = ((CodeSignature)jp.getSignature()).getParameterTypes();
for (int i = 0; i < args.length; i++) {
- println(" " + i + ". " + names[i] +
- " : " + types[i].getName() +
- " = " + args[i]);
+ println(" " + i + ". " + names[i] +
+ " : " + types[i].getName() +
+ " = " + args[i]);
}
}
}
diff --git a/docs/dist/doc/examples/tracing/TwoDShape.java b/docs/dist/doc/examples/tracing/TwoDShape.java
index 960a01b89..531b6f120 100644
--- a/docs/dist/doc/examples/tracing/TwoDShape.java
+++ b/docs/dist/doc/examples/tracing/TwoDShape.java
@@ -1,5 +1,4 @@
/*
-
Copyright (c) Xerox Corporation 1998-2002. All rights reserved.
Use and copying of this software and preparation of derivative works based
@@ -9,21 +8,13 @@ laws.
This software is made available AS IS, and Xerox Corporation makes no warranty
about the software, its performance or its conformity to any specification.
-
-|<--- this code is formatted to fit into 80 columns --->|
-|<--- this code is formatted to fit into 80 columns --->|
-|<--- this code is formatted to fit into 80 columns --->|
-
*/
-
package tracing;
/**
- *
- * TwoDShape is an abstract class that defines generic functionality
+ * TwoDShape is an abstract class that defines generic functionality
* for 2D shapes.
- *
*/
public abstract class TwoDShape {
/**
diff --git a/docs/dist/doc/examples/tracing/version1/Trace.java b/docs/dist/doc/examples/tracing/version1/Trace.java
index eef96df51..97b5edb3f 100644
--- a/docs/dist/doc/examples/tracing/version1/Trace.java
+++ b/docs/dist/doc/examples/tracing/version1/Trace.java
@@ -1,5 +1,4 @@
/*
-
Copyright (c) Xerox Corporation 1998-2002. All rights reserved.
Use and copying of this software and preparation of derivative works based
@@ -9,11 +8,6 @@ laws.
This software is made available AS IS, and Xerox Corporation makes no warranty
about the software, its performance or its conformity to any specification.
-
-|<--- this code is formatted to fit into 80 columns --->|
-|<--- this code is formatted to fit into 80 columns --->|
-|<--- this code is formatted to fit into 80 columns --->|
-
*/
package tracing.version1;
@@ -30,7 +24,7 @@ public class Trace {
/**
* There are 3 trace levels (values of TRACELEVEL):
* 0 - No messages are printed
- * 1 - Trace messages are printed, but there is no indentation
+ * 1 - Trace messages are printed, but there is no indentation
* according to the call stack
* 2 - Trace messages are printed, and they are indented
* according to the call stack
diff --git a/docs/dist/doc/examples/tracing/version1/TraceMyClasses.java b/docs/dist/doc/examples/tracing/version1/TraceMyClasses.java
index b4a97ee31..736e96413 100644
--- a/docs/dist/doc/examples/tracing/version1/TraceMyClasses.java
+++ b/docs/dist/doc/examples/tracing/version1/TraceMyClasses.java
@@ -1,5 +1,4 @@
/*
-
Copyright (c) Xerox Corporation 1998-2002. All rights reserved.
Use and copying of this software and preparation of derivative works based
@@ -9,18 +8,13 @@ laws.
This software is made available AS IS, and Xerox Corporation makes no warranty
about the software, its performance or its conformity to any specification.
-
-|<--- this code is formatted to fit into 80 columns --->|
-|<--- this code is formatted to fit into 80 columns --->|
-|<--- this code is formatted to fit into 80 columns --->|
-
*/
package tracing.version1;
/**
*
- * This class connects the tracing functions in the Trace class with
+ * This class connects the tracing functions in the Trace class with
* the constructors and methods in the application classes.
*
*/
diff --git a/docs/dist/doc/examples/tracing/version2/Trace.java b/docs/dist/doc/examples/tracing/version2/Trace.java
index cd631e278..6c43d60f8 100644
--- a/docs/dist/doc/examples/tracing/version2/Trace.java
+++ b/docs/dist/doc/examples/tracing/version2/Trace.java
@@ -1,5 +1,4 @@
/*
-
Copyright (c) Xerox Corporation 1998-2002. All rights reserved.
Use and copying of this software and preparation of derivative works based
@@ -9,11 +8,6 @@ laws.
This software is made available AS IS, and Xerox Corporation makes no warranty
about the software, its performance or its conformity to any specification.
-
-|<--- this code is formatted to fit into 80 columns --->|
-|<--- this code is formatted to fit into 80 columns --->|
-|<--- this code is formatted to fit into 80 columns --->|
-
*/
package tracing.version2;
@@ -25,7 +19,7 @@ import java.io.PrintStream;
* This class provides support for printing trace messages into a stream.
* Trace messages are printed before and after constructors and methods
* are executed.
- * It defines one abstract crosscut for injecting that tracing functionality
+ * It defines one abstract crosscut for injecting that tracing functionality
* into any application classes.
* To use it, provide a subclass that concretizes the abstract crosscut.
*/
@@ -38,7 +32,7 @@ abstract aspect Trace {
/**
* There are 3 trace levels (values of TRACELEVEL):
* 0 - No messages are printed
- * 1 - Trace messages are printed, but there is no indentation
+ * 1 - Trace messages are printed, but there is no indentation
* according to the call stack
* 2 - Trace messages are printed, and they are indented
* according to the call stack
diff --git a/docs/dist/doc/examples/tracing/version2/TraceMyClasses.java b/docs/dist/doc/examples/tracing/version2/TraceMyClasses.java
index a3ae99e95..d9ba21c54 100644
--- a/docs/dist/doc/examples/tracing/version2/TraceMyClasses.java
+++ b/docs/dist/doc/examples/tracing/version2/TraceMyClasses.java
@@ -1,5 +1,4 @@
/*
-
Copyright (c) Xerox Corporation 1998-2002. All rights reserved.
Use and copying of this software and preparation of derivative works based
@@ -9,11 +8,6 @@ laws.
This software is made available AS IS, and Xerox Corporation makes no warranty
about the software, its performance or its conformity to any specification.
-
-|<--- this code is formatted to fit into 80 columns --->|
-|<--- this code is formatted to fit into 80 columns --->|
-|<--- this code is formatted to fit into 80 columns --->|
-
*/
package tracing.version2;
@@ -25,7 +19,7 @@ import tracing.ExampleMain;
/**
*
- * This class concretizes the abstract crosscut in Trace,
+ * This class concretizes the abstract crosscut in Trace,
* applying the trace facility to these application classes.
*
*/
diff --git a/docs/dist/doc/quick.pdf b/docs/dist/doc/quick.pdf
index b82afdcba..5ea889a66 100644
--- a/docs/dist/doc/quick.pdf
+++ b/docs/dist/doc/quick.pdf
Binary files differ
diff --git a/docs/dist/doc/quickA4.pdf b/docs/dist/doc/quickA4.pdf
new file mode 100644
index 000000000..514c93fae
--- /dev/null
+++ b/docs/dist/doc/quickA4.pdf
Binary files differ