Merge pull request #3328 from deathbeam/marker-timestamp-based

Store markers based on epoch millis
This commit is contained in:
Adam
2018-05-27 15:42:52 -04:00
committed by GitHub
3 changed files with 4 additions and 1 deletions

View File

@@ -35,6 +35,7 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
public class ScreenMarker
{
private long id;
private String name;
private int borderThickness;
private Color color;

View File

@@ -52,7 +52,7 @@ public class ScreenMarkerOverlay extends Overlay
@Override
public String getName()
{
return marker.getName();
return "marker" + marker.getId();
}
@Override

View File

@@ -33,6 +33,7 @@ import com.google.gson.reflect.TypeToken;
import java.awt.Dimension;
import java.awt.Point;
import java.awt.image.BufferedImage;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -170,6 +171,7 @@ public class ScreenMarkerPlugin extends Plugin
public void startCreation(Point location)
{
currentMarker = new ScreenMarker(
Instant.now().toEpochMilli(),
DEFAULT_MARKER_NAME + " " + (screenMarkers.size() + 1),
pluginPanel.getSelectedBorderThickness(),
pluginPanel.getSelectedColor(),