Skip to content

Commit

Permalink
Merge branch 'master' into jparsec3
Browse files Browse the repository at this point in the history
  • Loading branch information
mstegmaier authored May 15, 2018
2 parents 3fd3972 + bb37c60 commit e21ad83
Show file tree
Hide file tree
Showing 73 changed files with 276 additions and 313 deletions.
9 changes: 9 additions & 0 deletions org.coreasm.engine/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -91,14 +91,23 @@
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<useIncrementalCompilation>false</useIncrementalCompilation>
</configuration>
</plugin>

Expand Down
14 changes: 2 additions & 12 deletions org.coreasm.engine/src/org/coreasm/engine/CoreASMEngine.java
Original file line number Diff line number Diff line change
Expand Up @@ -474,16 +474,6 @@ public void updateState(Set<Update> update)
* @see #removeObserver(EngineObserver)
*/
public Collection<EngineObserver> getObservers();

/**
* Waits for the engine to go to the idle or error mode. This
* method should periodically put the current thread in
* a sleep mode to avoid taking CPU time.
*
* @deprecated Use {@link #waitWhileBusy()} instead.
*/
@Deprecated
public void waitForIdleOrError();

/**
* Waits for the engine to go to the idle/error mode. This
Expand All @@ -497,10 +487,10 @@ public void updateState(Set<Update> update)
/**
* Returns <code>true</code> if the engine is
* busy performing some operation. This condition is
* used in {@link #waitForIdleOrError()} to wait
* used in {@link #waitWhileBusy()} to wait
* until the engine finishes its work.
*
* @see #waitForIdleOrError()
* @see #waitWhileBusy()
*/
public boolean isBusy();

Expand Down
Loading

0 comments on commit e21ad83

Please sign in to comment.