Skip to content

Commit 7dfdab3

Browse files
BruceEckelBruceEckel
committed
update
1 parent 1928f34 commit 7dfdab3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+285
-336
lines changed

‎annotations/build.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
<jrun cls="annotations.AtUnitExample5" dirpath="../annotations" />
1616
<jrun cls="annotations.AtUnitExternalTest" dirpath="../annotations" />
1717
<jrun cls="annotations.HashSetTest" dirpath="../annotations" />
18-
<jrun cls="annotations.Multiplier" dirpath="../annotations" />
1918
<jrun cls="annotations.StackLStringTest" dirpath="../annotations" />
2019
<jrun cls="UseCaseTracker" />
2120
<jrun cls="annotations.database.TableCreator" dirpath="../annotations/database" arguments="annotations.database.Member" />
21+
<jrun cls="annotations.ifx.Multiplier" dirpath="../annotations/ifx" />
2222
<jrun cls="annotations.simplest.SimpleTest" dirpath="../annotations/simplest" />
2323
</target>
2424

‎annotations/ifx/IfaceExtractorProcessor.java‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,11 @@ public class IfaceExtractorProcessor
1515
extends AbstractProcessor {
1616
private ArrayList<Element>
1717
interfaceMethods = new ArrayList<>();
18-
Types typeUtils;
1918
Elements elementUtils;
20-
2119
private ProcessingEnvironment processingEnv;
2220
@Override public void
2321
init(ProcessingEnvironment processingEnv) {
2422
this.processingEnv = processingEnv;
25-
typeUtils = processingEnv.getTypeUtils();
2623
elementUtils = processingEnv.getElementUtils();
2724
}
2825
@Override public boolean
@@ -43,25 +40,11 @@ public class IfaceExtractorProcessor
4340
interfaceMethods.add(enclosed);
4441
}
4542
}
46-
if(interfaceMethods.size() > 0) {
43+
if(interfaceMethods.size() > 0)
4744
writeInterfaceFile(interfaceName);
48-
}
4945
}
5046
return false;
5147
}
52-
private String createArgList(
53-
List<? extends VariableElement> parameters) {
54-
if(parameters.size() == 0)
55-
return "()";
56-
String args = "(";
57-
for(VariableElement p : parameters) {
58-
args += p.asType() + " ";
59-
args += p.getSimpleName() + ", ";
60-
}
61-
args = args.substring(0, args.length() - 2);
62-
args += ")";
63-
return args;
64-
}
6548
private void
6649
writeInterfaceFile(String interfaceName) {
6750
try {
@@ -92,4 +75,17 @@ private String createArgList(
9275
throw new RuntimeException(e);
9376
}
9477
}
78+
private String createArgList(
79+
List<? extends VariableElement> parameters) {
80+
if(parameters.size() == 0)
81+
return "()";
82+
String args = "(";
83+
for(VariableElement p : parameters) {
84+
args += p.asType() + " ";
85+
args += p.getSimpleName() + ", ";
86+
}
87+
args = args.substring(0, args.length() - 2);
88+
args += ")";
89+
return args;
90+
}
9591
} ///:~

‎annotations/simplest/SimpleProcessor.java‎

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,27 @@ public class SimpleProcessor
1717
for(TypeElement t : annotations)
1818
System.out.println(t);
1919
for(Element el :
20-
env.getElementsAnnotatedWith(Simple.class)){
21-
System.out.println(el.getKind() +
22-
" : " + el.getModifiers() +
23-
" : " + el.getSimpleName() +
24-
" : " + el.asType());
25-
}
20+
env.getElementsAnnotatedWith(Simple.class))
21+
display(el);
2622
return false;
2723
}
24+
private void display(Element el) {
25+
System.out.println("==== " + el + " ====");
26+
System.out.println(el.getKind() +
27+
" : " + el.getModifiers() +
28+
" : " + el.getSimpleName() +
29+
" : " + el.asType());
30+
if(el.getKind().equals(ElementKind.CLASS)) {
31+
TypeElement te = (TypeElement)el;
32+
System.out.println(te.getQualifiedName());
33+
System.out.println(te.getSuperclass());
34+
System.out.println(te.getEnclosedElements());
35+
}
36+
if(el.getKind().equals(ElementKind.METHOD)) {
37+
ExecutableElement ex = (ExecutableElement)el;
38+
System.out.print(ex.getReturnType() + " ");
39+
System.out.print(ex.getSimpleName() + "(");
40+
System.out.println(ex.getParameters() + ")");
41+
}
42+
}
2843
} ///:~

‎annotations/simplest/SimpleTest.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ public void foo() {
1313
System.out.println("SimpleTest.foo()");
1414
}
1515
@Simple
16+
public void bar(String s, int i, float f) {
17+
System.out.println("SimpleTest.bar()");
18+
}
19+
@Simple
1620
public static void main(String[] args) {
1721
@Simple
1822
SimpleTest st = new SimpleTest();

‎assertions/Queue.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//: assertions/Queue.java
2-
// Demonstration of Design by Contract (DBC) combined
2+
// Demonstration of Design by Contract (DbC) combined
33
// with white-box unit testing.
44
// (Install libraries from www.junit.org)
55
import java.util.*;

‎containers/Unsupported.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ public static void main(String[] args) {
4141
test("Modifiable Copy", new ArrayList<>(list));
4242
test("Arrays.asList()", list);
4343
test("unmodifiableList()",
44-
Collections.unmodifiableList(
45-
new ArrayList<>(list)));
44+
Collections.unmodifiableList(new ArrayList<>(list)));
4645
}
4746
} /* Output:
4847
--- Modifiable Copy ---

‎generics/BankTeller.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ private Customer() {}
1111
public String toString() { return "Customer " + id; }
1212
// A method to produce Generator objects:
1313
public static Generator<Customer> generator() {
14-
return () -> new Customer();
14+
return Customer::new; // Constructor reference
1515
}
1616
}
1717

@@ -22,8 +22,7 @@ private Teller() {}
2222
@Override
2323
public String toString() { return "Teller " + id; }
2424
// A single Generator object:
25-
public static Generator<Teller> generator =
26-
() -> new Teller();
25+
public static Generator<Teller> generator = Teller::new;
2726
}
2827

2928
public class BankTeller {

‎generics/Mixins.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class Basic {
3030
};
3131

3232
int main() {
33-
TimeStamped<SerialNumbered<Basic> > mixin1, mixin2;
33+
TimeStamped<SerialNumbered<Basic>> mixin1, mixin2;
3434
mixin1.set("test string 1");
3535
mixin2.set("test string 2");
3636
cout << mixin1.get() << " " << mixin1.getStamp() <<

‎generics/Mixins.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ class SerialNumberedImp implements SerialNumbered {
2222
}
2323

2424
interface Basic {
25-
public void set(String val);
26-
public String get();
25+
void set(String val);
26+
String get();
2727
}
2828

2929
class BasicImp implements Basic {

‎generics/Wildcards.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,19 @@ static void unboundedArg(Holder<?> holder, Object arg) {
2929
Object obj = holder.get();
3030
}
3131
static <T> T exact1(Holder<T> holder) {
32-
T t = holder.get();
33-
return t;
32+
return holder.get();
3433
}
3534
static <T> T exact2(Holder<T> holder, T arg) {
3635
holder.set(arg);
37-
T t = holder.get();
38-
return t;
36+
return holder.get();
3937
}
4038
static <T>
4139
T wildSubtype(Holder<? extends T> holder, T arg) {
4240
// holder.set(arg); // Error:
4341
// set(capture of ? extends T) in
4442
// Holder<capture of ? extends T>
4543
// cannot be applied to (T)
46-
T t = holder.get();
47-
return t;
44+
return holder.get();
4845
}
4946
static <T>
5047
void wildSupertype(Holder<? super T> holder, T arg) {

0 commit comments

Comments
 (0)