Skip to content

Commit

Permalink
Some additional cleanup on this API.
Browse files Browse the repository at this point in the history
  • Loading branch information
J.W. Janssen committed Jan 29, 2012
1 parent 493ddcf commit 736a576
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 27 deletions.
23 changes: 0 additions & 23 deletions api/src/main/java/nl/lxtreme/ols/api/data/DataContainer.java
Original file line number Diff line number Diff line change
Expand Up @@ -458,17 +458,6 @@ public boolean isCursorPositionSet( final int aCursorIdx )
return ( cursorPositions[aCursorIdx] != null ) && ( cursorPositions[aCursorIdx].isDefined() );
}

/**
* Returns whether or not the cursor data is enabled.
*
* @return <code>true</code> if the cursors are enabled, <code>false</code>
* otherwise.
*/
public boolean isCursorsEnabled()
{
return getCurrentDataSet().isCursorsEnabled();
}

/**
* Sets the captured data.
*
Expand Down Expand Up @@ -533,18 +522,6 @@ public void setChannelLabels( final String[] aLabels )
}
}

/**
* Sets whether or not the cursor data is enabled.
*
* @param aCursorEnabled
* <code>true</code> to the enable the cursor data,
* <code>false</code> otherwise.
*/
public void setCursorEnabled( final boolean aCursorEnabled )
{
getCurrentDataSet().setCursorsEnabled( aCursorEnabled );
}

/**
* Sets a cursor position.
*
Expand Down
1 change: 0 additions & 1 deletion api/src/main/java/nl/lxtreme/ols/api/data/DataSet.java
Original file line number Diff line number Diff line change
Expand Up @@ -87,5 +87,4 @@ public interface DataSet
* otherwise.
*/
public void setCursorsEnabled( final boolean aEnabled );

}
7 changes: 4 additions & 3 deletions api/src/main/java/nl/lxtreme/ols/api/data/Sample.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
/**
* Denotes a sample of data, which has a value and a timestamp.
*/
@Deprecated
public final class Sample implements Cloneable
{
// CONSTANTS
Expand Down Expand Up @@ -158,9 +159,9 @@ public int hashCode()
{
final int prime = 31;
int result = 1;
result = prime * result + ( int )( this.timestamp ^ ( this.timestamp >>> 32 ) );
result = prime * result + this.value;
result = prime * result + this.width;
result = ( prime * result ) + ( int )( this.timestamp ^ ( this.timestamp >>> 32 ) );
result = ( prime * result ) + this.value;
result = ( prime * result ) + this.width;
return result;
}

Expand Down

0 comments on commit 736a576

Please sign in to comment.