Skip to content

Commit aa63201

Browse files
REASREAS
committed
Removing advanced constructors from new Data reference
1 parent 9425a31 commit aa63201

9 files changed

Lines changed: 72 additions & 22 deletions

File tree

‎core/src/processing/data/FloatDict.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ public FloatDict() {
3636
/**
3737
* Create a new lookup with a specific size. This is more efficient than not
3838
* specifying a size. Use it when you know the rough size of the thing you're creating.
39+
*
40+
* @nowebref
3941
*/
4042
public FloatDict(int length) {
4143
count = 0;
@@ -47,6 +49,8 @@ public FloatDict(int length) {
4749
/**
4850
* Read a set of entries from a Reader that has each key/value pair on
4951
* a single line, separated by a tab.
52+
*
53+
* @nowebref
5054
*/
5155
public FloatDict(BufferedReader reader) {
5256
// public FloatHash(PApplet parent, String filename) {
@@ -66,7 +70,9 @@ public FloatDict(BufferedReader reader) {
6670
}
6771
}
6872

69-
73+
/**
74+
* @nowebref
75+
*/
7076
public FloatDict(String[] keys, float[] values) {
7177
if (keys.length != values.length) {
7278
throw new IllegalArgumentException("key and value arrays must be the same length");

‎core/src/processing/data/FloatList.java‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,25 @@ public FloatList() {
2626
data = new float[10];
2727
}
2828

29-
29+
/**
30+
* @nowebref
31+
*/
3032
public FloatList(int length) {
3133
data = new float[length];
3234
}
3335

34-
36+
/**
37+
* @nowebref
38+
*/
3539
public FloatList(float[] list) {
3640
count = list.length;
3741
data = new float[count];
3842
System.arraycopy(list, 0, data, 0, count);
3943
}
4044

41-
45+
/**
46+
* @nowebref
47+
*/
4248
public FloatList(Iterable<Float> iter) {
4349
this(10);
4450
for (float v : iter) {

‎core/src/processing/data/IntDict.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ public IntDict() {
5959
/**
6060
* Create a new lookup with a specific size. This is more efficient than not
6161
* specifying a size. Use it when you know the rough size of the thing you're creating.
62+
*
63+
* @nowebref
6264
*/
6365
public IntDict(int length) {
6466
count = 0;
@@ -70,6 +72,8 @@ public IntDict(int length) {
7072
/**
7173
* Read a set of entries from a Reader that has each key/value pair on
7274
* a single line, separated by a tab.
75+
*
76+
* @nowebref
7377
*/
7478
public IntDict(BufferedReader reader) {
7579
// public IntHash(PApplet parent, String filename) {
@@ -89,7 +93,9 @@ public IntDict(BufferedReader reader) {
8993
}
9094
}
9195

92-
96+
/**
97+
* @nowebref
98+
*/
9399
public IntDict(String[] keys, int[] values) {
94100
if (keys.length != values.length) {
95101
throw new IllegalArgumentException("key and value arrays must be the same length");

‎core/src/processing/data/IntList.java‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,25 @@ public IntList() {
3131
data = new int[10];
3232
}
3333

34-
34+
/**
35+
* @nowebref
36+
*/
3537
public IntList(int length) {
3638
data = new int[length];
3739
}
3840

39-
41+
/**
42+
* @nowebref
43+
*/
4044
public IntList(int[] source) {
4145
count = source.length;
4246
data = new int[count];
4347
System.arraycopy(source, 0, data, 0, count);
4448
}
4549

46-
50+
/**
51+
* @nowebref
52+
*/
4753
public IntList(Iterable<Integer> iter) {
4854
this(10);
4955
for (int v : iter) {

‎core/src/processing/data/JSONArray.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ public class JSONArray {
108108

109109
/**
110110
* Construct an empty JSONArray.
111-
* @nowebref
112111
*/
113112
public JSONArray() {
114113
this.myArrayList = new ArrayList<Object>();
@@ -125,8 +124,10 @@ public JSONArray(Reader reader) {
125124

126125
/**
127126
* Construct a JSONArray from a JSONTokener.
127+
*
128128
* @param x A JSONTokener
129129
* @throws JSONException If there is a syntax error.
130+
* @nowebref
130131
*/
131132
protected JSONArray(JSONTokener x) {
132133
this();

‎core/src/processing/data/StringDict.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ public StringDict() {
3737
* Create a new lookup pre-allocated to a specific length. This will not
3838
* change the size(), but is more efficient than not specifying a length.
3939
* Use it when you know the rough size of the thing you're creating.
40+
*
41+
* @nowebref
4042
*/
4143
public StringDict(int length) {
4244
count = 0;
@@ -48,6 +50,8 @@ public StringDict(int length) {
4850
/**
4951
* Read a set of entries from a Reader that has each key/value pair on
5052
* a single line, separated by a tab.
53+
*
54+
* @nowebref
5155
*/
5256
public StringDict(BufferedReader reader) {
5357
String[] lines = PApplet.loadStrings(reader);
@@ -64,7 +68,9 @@ public StringDict(BufferedReader reader) {
6468
}
6569
}
6670

67-
71+
/**
72+
* @nowebref
73+
*/
6874
public StringDict(String[] keys, String[] values) {
6975
if (keys.length != values.length) {
7076
throw new IllegalArgumentException("key and value arrays must be the same length");

‎core/src/processing/data/StringList.java‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,29 @@ public StringList() {
2525
this(10);
2626
}
2727

28-
28+
/**
29+
* @nowebref
30+
*/
2931
public StringList(int length) {
3032
data = new String[length];
3133
}
3234

33-
35+
/**
36+
* @nowebref
37+
*/
3438
public StringList(String[] list) {
3539
count = list.length;
3640
data = new String[count];
3741
System.arraycopy(list, 0, data, 0, count);
3842
}
3943

4044

41-
// Create from something iterable, for instance:
42-
// StringList list = new StringList(hashMap.keySet());
45+
/**
46+
* Create from something iterable, for instance:
47+
* StringList list = new StringList(hashMap.keySet());
48+
*
49+
* @nowebref
50+
*/
4351
public StringList(Iterable<String> iter) {
4452
this(10);
4553
for (String s : iter) {

‎core/src/processing/data/Table.java‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,21 +99,29 @@ public Table() {
9999
init();
100100
}
101101

102-
102+
/**
103+
* @nowebref
104+
*/
103105
public Table(File file) throws IOException {
104106
this(file, null);
105107
}
106108

107109

108-
// version that uses a File object; future releases (or data types)
109-
// may include additional optimizations here
110+
/**
111+
* version that uses a File object; future releases (or data types)
112+
* may include additional optimizations here
113+
*
114+
* @nowebref
115+
*/
110116
public Table(File file, String options) throws IOException {
111117
// uses createInput() to handle .gz (and eventually .bz2) files
112118
parse(PApplet.createInput(file),
113119
extensionOptions(true, file.getName(), options));
114120
}
115121

116-
122+
/**
123+
* @nowebref
124+
*/
117125
public Table(InputStream input) throws IOException {
118126
this(input, null);
119127
}
@@ -127,6 +135,8 @@ public Table(InputStream input) throws IOException {
127135
* <li>newlines - this CSV file contains newlines inside individual cells
128136
* <li>header - this table has a header (title) row
129137
* </ul>
138+
*
139+
* @nowebref
130140
* @param input
131141
* @param options
132142
* @throws IOException
@@ -135,7 +145,9 @@ public Table(InputStream input, String options) throws IOException {
135145
parse(input, options);
136146
}
137147

138-
148+
/**
149+
* @nowebref
150+
*/
139151
public Table(ResultSet rs) {
140152
init();
141153
try {

‎core/src/processing/data/XML.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public class XML implements Serializable {
6363

6464
/**
6565
* @nowebref
66-
*/
66+
*/
6767
protected XML() { }
6868

6969

@@ -179,9 +179,8 @@ public XML(Reader reader, String options) throws IOException, ParserConfiguratio
179179

180180

181181
/**
182-
* @param name description TBD
182+
* @param name creates a node with this name
183183
*
184-
* @nowebref
185184
*/
186185
public XML(String name) {
187186
try {

0 commit comments

Comments
 (0)