Skip to content

Commit

Permalink
Merge pull request #15 from lhumphrey/master
Browse files Browse the repository at this point in the history
Address some deprecation warnings
  • Loading branch information
lhumphrey committed Sep 29, 2023
2 parents 1453386 + a7c68b1 commit 178a6e0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 14 deletions.
8 changes: 0 additions & 8 deletions OpenAMASE/src/Core/avtas/map/graphics/MapGraphicsList.java
Original file line number Diff line number Diff line change
Expand Up @@ -109,14 +109,6 @@ public void setPainter(Painter painter) {
super.setPainter(painter);
}

/**
* @deprecated Use {@link #size() } instead.
* @return length of the internalList
*/
public int getLength() {
return internalList.size();
}

/**
* Returns all of the graphics that intersect the given screen location in the
* current projection.
Expand Down
12 changes: 6 additions & 6 deletions OpenAMASE/src/Core/avtas/swing/IntegerWrapModel.java
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,19 @@ public IntegerWrapModel(int val, int min, int max, int interval) {
this.max = max;
this.interval = interval;

setValue( new Integer(val));
setValue(val);
}

public Object getPreviousValue() {
if (val - interval >= min)
return new Integer(val-interval);
else return new Integer(max-interval);
return (val - interval);
else return (max - interval);
}

public Object getNextValue() {
if (val + interval < max)
return new Integer(val + interval);
else return new Integer(min);
return (val + interval);
else return min;
}

public void setValue(Object o) {
Expand All @@ -60,7 +60,7 @@ public void setValue(Object o) {
}

public Object getValue() {
return new Integer(val);
return val;
}
}

Expand Down

0 comments on commit 178a6e0

Please sign in to comment.