Skip to content

Commit

Permalink
Delete time from BuildDateTime
Browse files Browse the repository at this point in the history
  • Loading branch information
agran committed Feb 15, 2016
1 parent ab54f50 commit 5dd6b3f
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Qora/src/Start.java
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public static void main(String args[])
throw new Exception("Both gui and rpc cannot be disabled!");
}

System.out.println("Starting Qora / version: "+ Controller.getInstance().getVersion() + " / buildtime: " + Controller.getInstance().getBuildDateTimeString() + " / ...");
System.out.println("Starting Qora / version: "+ Controller.getInstance().getVersion() + " / build date: " + Controller.getInstance().getBuildDateString() + " / ...");

//STARTING NETWORK/BLOCKCHAIN/RPC
Controller.getInstance().start();
Expand Down
2 changes: 1 addition & 1 deletion Qora/src/api/QoraResource.java
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public String getVersion()
JSONObject jsonObject = new JSONObject();

jsonObject.put("version", Controller.getInstance().getVersion());
jsonObject.put("buildDateTime", Controller.getInstance().getBuildDateTimeString());
jsonObject.put("buildDate", Controller.getInstance().getBuildDateString());
jsonObject.put("buildTimeStamp", Controller.getInstance().getBuildTimestamp());


Expand Down
4 changes: 4 additions & 0 deletions Qora/src/controller/Controller.java
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,10 @@ public String getBuildDateTimeString(){
return DateTimeFormat.timestamptoString(this.getBuildTimestamp(), "yyyy-MM-dd HH:mm:ss z", "UTC");
}

public String getBuildDateString(){
return DateTimeFormat.timestamptoString(this.getBuildTimestamp(), "yyyy-MM-dd", "UTC");
}

public long getBuildTimestamp() {
if(this.buildTimestamp == 0) {
Date date = new Date();
Expand Down
2 changes: 1 addition & 1 deletion Qora/src/gui/AboutFrame.java
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public void keyPressed(KeyEvent e) {
gbc_lbllversionLabel.gridy = 1;
aboutPanel.add(lblversionLabel, gbc_lbllversionLabel);

JLabel label = new JLabel("Build date: " + Controller.getInstance().getBuildDateTimeString());
JLabel label = new JLabel("Build date: " + Controller.getInstance().getBuildDateString());
label.setHorizontalAlignment(SwingConstants.CENTER);
label.setForeground(Color.WHITE);
label.setFont(new Font("Tahoma", Font.PLAIN, 13));
Expand Down

0 comments on commit 5dd6b3f

Please sign in to comment.