Skip to content

Commit 089f103

Browse files
author
Luke Spragg
committed
Misc Javadoc fixes and minor header update
1 parent 894e4c3 commit 089f103

7 files changed

Lines changed: 56 additions & 63 deletions

File tree

pom.xml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,11 @@
8383
<repositories>
8484
<repository>
8585
<id>sonatype-nexus-releases</id>
86-
<url>https://oss.sonatype.org/content/repositories/releases/</url>
86+
<url>https://oss.sonatype.org/content/repositories/releases</url>
8787
</repository>
8888
<repository>
8989
<id>sonatype-nexus-snapshots</id>
90-
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
90+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
9191
<snapshots>
9292
<enabled>true</enabled>
9393
<updatePolicy>always</updatePolicy>
@@ -99,11 +99,11 @@
9999
<pluginRepositories>
100100
<pluginRepository>
101101
<id>sonatype-nexus-releases</id>
102-
<url>https://oss.sonatype.org/content/repositories/releases/</url>
102+
<url>https://oss.sonatype.org/content/repositories/releases</url>
103103
</pluginRepository>
104104
<pluginRepository>
105105
<id>sonatype-nexus-snapshots</id>
106-
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
106+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
107107
<snapshots>
108108
<enabled>true</enabled>
109109
<updatePolicy>always</updatePolicy>
@@ -114,35 +114,35 @@
114114
<!-- Project dependencies -->
115115
<dependencies>
116116
<!-- Transitive -->
117-
<dependency>
118-
<groupId>org.apache.commons</groupId>
119-
<artifactId>commons-lang3</artifactId>
120-
<version>3.3.2</version>
121-
<scope>compile</scope>
122-
</dependency>
123117
<dependency>
124118
<groupId>com.flowpowered</groupId>
125119
<artifactId>flow-math</artifactId>
126120
<version>0.1.0-SNAPSHOT</version>
127121
<scope>compile</scope>
128122
</dependency>
123+
<dependency>
124+
<groupId>com.github.wolf480pl</groupId>
125+
<artifactId>jline-log4j2-appender</artifactId>
126+
<version>1.0.0-SNAPSHOT</version>
127+
<scope>compile</scope>
128+
<optional>true</optional>
129+
</dependency>
129130
<dependency>
130131
<groupId>jline</groupId>
131132
<artifactId>jline</artifactId>
132133
<version>2.12</version>
133134
<scope>compile</scope>
134135
</dependency>
135136
<dependency>
136-
<groupId>com.github.wolf480pl</groupId>
137-
<artifactId>jline-log4j2-appender</artifactId>
138-
<version>0.0.1-SNAPSHOT</version>
137+
<groupId>net.sf.trove4j</groupId>
138+
<artifactId>trove4j</artifactId>
139+
<version>3.0.3</version>
139140
<scope>compile</scope>
140-
<optional>true</optional>
141141
</dependency>
142142
<dependency>
143-
<groupId>uk.org.lidalia</groupId>
144-
<artifactId>lidalia-slf4j-ext</artifactId>
145-
<version>1.0.0</version>
143+
<groupId>org.apache.commons</groupId>
144+
<artifactId>commons-lang3</artifactId>
145+
<version>3.3.2</version>
146146
<scope>compile</scope>
147147
</dependency>
148148
<dependency>
@@ -152,9 +152,9 @@
152152
<scope>compile</scope>
153153
</dependency>
154154
<dependency>
155-
<groupId>net.sf.trove4j</groupId>
156-
<artifactId>trove4j</artifactId>
157-
<version>3.0.3</version>
155+
<groupId>uk.org.lidalia</groupId>
156+
<artifactId>lidalia-slf4j-ext</artifactId>
157+
<version>1.0.0</version>
158158
<scope>compile</scope>
159159
</dependency>
160160
<!-- Testing only -->

src/main/java/com/flowpowered/commons/ViewFrustum.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,21 +88,21 @@ public void update(Matrix4f projection, Matrix4f view) {
8888

8989
/**
9090
* Returns a new array containing the vertices of the frustum. They are in the following order, given by the intersection of the planes:
91-
* <p/>
91+
* <br>
9292
* RIGHT - TOP - NEAR
93-
* <p/>
93+
* <br>
9494
* RIGHT - TOP - FAR
95-
* <p/>
95+
* <br>
9696
* RIGHT - BOTTOM - NEAR
97-
* <p/>
97+
* <br>
9898
* RIGHT - BOTTOM - FAR
99-
* <p/>
99+
* <br>
100100
* LEFT - TOP - NEAR
101-
* <p/>
101+
* <br>
102102
* LEFT - TOP - FAR
103-
* <p/>
103+
* <br>
104104
* LEFT - BOTTOM - NEAR
105-
* <p/>
105+
* <br>
106106
* LEFT - BOTTOM - FAR
107107
*
108108
* @return An array containing the frustum vertices

src/main/java/com/flowpowered/commons/map/impl/TSyncIntObjectHashMap.java

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,25 @@
11
/*
2-
* This file is part of Flow Commons.
2+
* This file is part of Flow Commons, licensed under the MIT License (MIT).
33
*
4-
* Copyright (c) 2013 Spout LLC <http://www.spout.org/>
4+
* Copyright (c) 2013 Spout LLC <https://spout.org/>
55
*
6-
* Effective until June 25, 2014, this file is license under the Spout License Version 1.
7-
* After June 25, 2014, this file becomes licensed under the MIT license.
8-
* All changes occuring after Janurary 31, 2014 are immediately consider licensed under the MIT license.
6+
* Permission is hereby granted, free of charge, to any person obtaining a copy
7+
* of this software and associated documentation files (the "Software"), to deal
8+
* in the Software without restriction, including without limitation the rights
9+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
* copies of the Software, and to permit persons to whom the Software is
11+
* furnished to do so, subject to the following conditions:
912
*
10-
* Spout is free software: you can redistribute it and/or modify it under
11-
* the terms of the GNU Lesser General Public License as published by the Free
12-
* Software Foundation, either version 3 of the License, or (at your option)
13-
* any later version.
13+
* The above copyright notice and this permission notice shall be included in
14+
* all copies or substantial portions of the Software.
1415
*
15-
* In addition, 180 days after any changes are published, you can use the
16-
* software, incorporating those changes, under the terms of the MIT license,
17-
* as described in the Spout License Version 1.
18-
*
19-
* Spout is distributed in the hope that it will be useful, but WITHOUT ANY
20-
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
21-
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
22-
* more details.
23-
*
24-
* You should have received a copy of the GNU Lesser General Public License,
25-
* the MIT license and the Spout License Version 1 along with this program.
26-
* If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
27-
* License and see <http://spout.in/licensev1> for the full license, including
28-
* the MIT license.
16+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22+
* THE SOFTWARE.
2923
*/
3024
package com.flowpowered.commons.map.impl;
3125

src/main/java/com/flowpowered/commons/map/impl/TTripleInt21ObjectHashMap.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@ public T putIfAbsent(int x, int y, int z, T value) {
9191
}
9292

9393
/**
94-
* Returns the value to which the specified key is mapped, or <code>null</code> if this map contains no mapping for the key. <p> More formally, if this map contains a mapping from a key
94+
* Returns the value to which the specified key is mapped, or <code>null</code> if this map contains no mapping for the key.<br> More formally, if this map contains a mapping from a key
9595
* <code>k</code> to a value <code>v</code> such that <code>(key==null ? k==null : key.equals(k))</code>, then this method returns <code>v</code>; otherwise it returns <code>null</code>. (There
96-
* can be at most one such mapping.) <p> If this map permits <code>null</code> values, then a return value of <code>null</code> does not <i>necessarily</i> indicate that the map contains no
96+
* can be at most one such mapping.)<br> If this map permits <code>null</code> values, then a return value of <code>null</code> does not <i>necessarily</i> indicate that the map contains no
9797
* mapping for the key; it's also possible that the map explicitly maps the key to <code>null</code>. The {@see #containsKey(int, int, int) containsKey} operation may be used to distinguish these
9898
* two cases.
9999
*
@@ -188,9 +188,9 @@ public long[] keys() {
188188

189189
/**
190190
* Removes the mapping for a key from this map if it is present (optional operation). More formally, if this map contains a mapping from key <code>k</code> to value <code>v</code> such that
191-
* <code>key.equals(k)</code>, that mapping is removed. (The map can contain at most one such mapping.) <p> Returns the value to which this map previously associated the key, or <code>null</code>
192-
* if the map contained no mapping for the key. </p> If this map permits null values, then a return value of <code>null</code> does not <i>necessarily</i> indicate that the map contained no
193-
* mapping for the key; it's also possible that the map explicitly mapped the key to <code>null</code>. <p> The map will not contain a mapping for the specified key once the call returns.
191+
* <code>key.equals(k)</code>, that mapping is removed. (The map can contain at most one such mapping.)<br> Returns the value to which this map previously associated the key, or <code>null</code>
192+
* if the map contained no mapping for the key.<br> If this map permits null values, then a return value of <code>null</code> does not <i>necessarily</i> indicate that the map contained no
193+
* mapping for the key; it's also possible that the map explicitly mapped the key to <code>null</code>.<br> The map will not contain a mapping for the specified key once the call returns.
194194
*
195195
* @param x an <code>int</code> value
196196
* @param y an <code>int</code> value

src/main/java/com/flowpowered/commons/queue/SubscribableQueue.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@
3737
* {@link #addAll(java.util.Collection)} or {@link #offer(Object)}) will be added to all the thread queues, but any removal operation is confined to the thread's queue. A thread needs to subscribe to
3838
* the queue before being able to use it, using {@link #subscribe()}. The queue to use is selected from the calling thread, using {@link Thread#currentThread()}. Once done, a thread should unsubscribe
3939
* using {@link #unsubscribe()}.
40-
* <p/>
40+
* <br>
4141
* When a thread constructs a new {@link SubscribableQueue}, it can declared itself as the publisher thread, and the operation of the following methods is limited to that thread only: {@link
4242
* #unsubscribeAll()}. The following operations operate on all queues if called by the publisher, else on the thread's own queue: {@link #add(Object)}, {@link #addAll(java.util.Collection)}, {@link
4343
* #offer(Object)}.
44-
* <p/>
44+
* <br>
4545
* It's possible to add objects for only specific subscribers, as long as they have provided a non-null identifier object when using {@link #subscribe(Object)}, and that the publisher knows which
4646
* object corresponds to which thread. Calling {@link #add(Object, Object)}, {@link #addAll(java.util.Collection, Object)} or {@link #offer(Object, Object)} using a valid identifier will ensure that
4747
* the object is only passed to the desired subscriber.
48-
* <p/>
48+
* <br>
4949
* Calls to methods can be expensive because of the cost of {@link Thread#currentThread()} on certain platforms. Using mass removal or addition operations ({@link #removeAll(java.util.Collection)},
5050
* {@link #addAll(java.util.Collection)}) is recommended when multiple items need to be removed or added.
5151
*/

src/main/java/com/flowpowered/commons/store/block/impl/AtomicVariableWidthArray.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ public final int width() {
254254
}
255255

256256
/**
257-
* Gets an array containing all the values in the array. The returned values are not guaranteed to be from the same time instant. <p/> If an array is provided and it is the correct length, then
257+
* Gets an array containing all the values in the array. The returned values are not guaranteed to be from the same time instant.<br> If an array is provided and it is the correct length, then
258258
* that array will be used as the destination array.
259259
*
260260
* @param array the provided array
@@ -284,10 +284,9 @@ public int[] getPacked() {
284284
return packed;
285285
}
286286

287-
/*
287+
/**
288288
* Remaining methods use the above methods
289289
*/
290-
291290
public int addAndGet(int i, int delta) {
292291
return addAndGet(i, delta, false);
293292
}

src/main/java/com/flowpowered/commons/ticking/Timer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
/**
3131
* A time class. Calling the {@link #sync()} method at the end of each tick will cause the thread to sleep for the correct time delay between the ticks. {@link #start()} must be called just before the
3232
* loop to start the timer. {@link #reset()} is used to reset the start time to the current time.
33-
* <p/>
33+
* <br>
3434
* Based on LWJGL's implementation of {@link org.lwjgl.opengl.Sync}.
3535
*/
3636
public class Timer {

0 commit comments

Comments
 (0)