Skip to content

Commit

Permalink
Merge pull request #108 from AlexanderWert/master
Browse files Browse the repository at this point in the history
release version 1.0.0
  • Loading branch information
AlexanderWert committed Aug 15, 2014
2 parents 155d809 + 84d7b8e commit c788334
Show file tree
Hide file tree
Showing 10 changed files with 40 additions and 34 deletions.
6 changes: 3 additions & 3 deletions org.spotter.client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.spotter</groupId>
<artifactId>org.spotter.parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0</version>
<relativePath>../org.spotter.parent</relativePath>
</parent>

Expand All @@ -23,13 +23,13 @@
<dependency>
<groupId>org.spotter</groupId>
<artifactId>org.spotter.shared</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0</version>
</dependency>

<dependency>
<groupId>org.spotter</groupId>
<artifactId>org.spotter.service</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0</version>
<scope>test</scope>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions org.spotter.core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.spotter</groupId>
<artifactId>org.spotter.parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0</version>
<relativePath>../org.spotter.parent</relativePath>
</parent>

Expand All @@ -16,7 +16,7 @@
<dependency>
<groupId>org.spotter</groupId>
<artifactId>org.spotter.shared</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0</version>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion org.spotter.eclipse.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: DynamicSpotter Eclipse UI
Bundle-SymbolicName: org.spotter.eclipse.ui;singleton:=true
Bundle-Version: 0.0.1.qualifier
Bundle-Version: 1.0.0
Bundle-Vendor: SAP AG
Bundle-Activator: org.spotter.eclipse.ui.Activator
Require-Bundle: org.eclipse.ui;bundle-version="3.105.0",
Expand Down
2 changes: 1 addition & 1 deletion org.spotter.eclipse.ui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.spotter</groupId>
<artifactId>org.spotter.parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0</version>
<relativePath>../org.spotter.parent</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions org.spotter.parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.spotter</groupId>
<artifactId>org.spotter.parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0</version>
<packaging>pom</packaging>
<name>DynamicSpotter</name>

<properties>
<lpe.common.version>1.0.2-SNAPSHOT</lpe.common.version>
<lpe.common.version>1.0.3</lpe.common.version>
</properties>

<modules>
Expand Down
4 changes: 2 additions & 2 deletions org.spotter.runner/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.spotter</groupId>
<artifactId>org.spotter.parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0</version>
<relativePath>../org.spotter.parent</relativePath>
</parent>

Expand Down Expand Up @@ -49,7 +49,7 @@
<dependency>
<groupId>org.spotter</groupId>
<artifactId>org.spotter.core</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0</version>
</dependency>
</dependencies>

Expand Down
4 changes: 2 additions & 2 deletions org.spotter.service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.spotter</groupId>
<artifactId>org.spotter.parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0</version>
<relativePath>../org.spotter.parent</relativePath>
</parent>

Expand All @@ -29,7 +29,7 @@
<dependency>
<groupId>org.spotter</groupId>
<artifactId>org.spotter.runner</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion org.spotter.shared/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.spotter</groupId>
<artifactId>org.spotter.parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0</version>
<relativePath>../org.spotter.parent</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@

/**
* Representation of the progress of a diagnosis step of Dynamic Spotter run.
*
*
* @author Alexander Wert
*
*
*/
public class DiagnosisProgress {
private String name;
Expand All @@ -33,17 +33,23 @@ public class DiagnosisProgress {
*/
public DiagnosisProgress() {
}

/**
* Constructor.
* @param name problem name
* @param status diagnosis status
* @param estimatedProgress estimated progress in percent
* @param estimatedRemainingDuration estimated remaining duration in seconds
* @param currentProgressMessage additional progress message
*
* @param name
* problem name
* @param status
* diagnosis status
* @param estimatedProgress
* estimated progress in percent
* @param estimatedRemainingDuration
* estimated remaining duration in seconds
* @param currentProgressMessage
* additional progress message
*/
public DiagnosisProgress(String name, DiagnosisStatus status, double estimatedProgress, long estimatedRemainingDuration,
String currentProgressMessage) {
public DiagnosisProgress(String name, DiagnosisStatus status, double estimatedProgress,
long estimatedRemainingDuration, String currentProgressMessage) {
super();
this.name = name;
this.status = status;
Expand All @@ -70,60 +76,60 @@ public void setName(String name) {
/**
* @return the status
*/
public DiagnosisStatus getStatus() {
public synchronized DiagnosisStatus getStatus() {
return status;
}

/**
* @param status
* the status to set
*/
public void setStatus(DiagnosisStatus status) {
public synchronized void setStatus(DiagnosisStatus status) {
this.status = status;
}

/**
* @return the estimatedProgress
*/
public double getEstimatedProgress() {
public synchronized double getEstimatedProgress() {
return estimatedProgress;
}

/**
* @param estimatedProgress
* the estimatedProgress to set
*/
public void setEstimatedProgress(double estimatedProgress) {
public synchronized void setEstimatedProgress(double estimatedProgress) {
this.estimatedProgress = estimatedProgress;
}

/**
* @return the estimatedRemainingDuration
*/
public long getEstimatedRemainingDuration() {
public synchronized long getEstimatedRemainingDuration() {
return estimatedRemainingDuration;
}

/**
* @param estimatedRemainingDuration
* the estimatedRemainingDuration to set
*/
public void setEstimatedRemainingDuration(long estimatedRemainingDuration) {
public synchronized void setEstimatedRemainingDuration(long estimatedRemainingDuration) {
this.estimatedRemainingDuration = estimatedRemainingDuration;
}

/**
* @return the currentProgressMessage
*/
public String getCurrentProgressMessage() {
public synchronized String getCurrentProgressMessage() {
return currentProgressMessage;
}

/**
* @param currentProgressMessage
* the currentProgressMessage to set
*/
public void setCurrentProgressMessage(String currentProgressMessage) {
public synchronized void setCurrentProgressMessage(String currentProgressMessage) {
this.currentProgressMessage = currentProgressMessage;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
*/
package org.spotter.shared.status;

import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;

/**
* Progress of a Dynamic Spotter run/job.
Expand All @@ -31,7 +31,7 @@ public class SpotterProgress {
* Constructor.
*/
public SpotterProgress() {
problemProgressMapping = new HashMap<>();
problemProgressMapping = new ConcurrentHashMap<>();
}


Expand Down

0 comments on commit c788334

Please sign in to comment.