diff options
| author | Noel Grandin <noel@peralex.com> | 2012-06-18 18:37:06 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-06-20 10:26:52 +0200 |
| commit | 2554f08f6544c54e45a5fc660d65d50ef3f29aed (patch) | |
| tree | ecd9bc25e060277a6875e9dac85d9a5d6d3de3aa /qadevOOo | |
| parent | 8d39b71f35e088f9e153e2462158ce2962cf3a8a (diff) | |
Fix some deprecation warnings
Change-Id: I60a02dea64a5f6fd34c2de86e60bdfb9171b3ea0
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
Diffstat (limited to 'qadevOOo')
| -rw-r--r-- | qadevOOo/runner/complexlib/Assurance.java | 6 | ||||
| -rw-r--r-- | qadevOOo/runner/complexlib/ComplexTestCase.java | 2 | ||||
| -rw-r--r-- | qadevOOo/runner/complexlib/MethodThread.java | 9 | ||||
| -rw-r--r-- | qadevOOo/runner/graphical/GlobalLogWriter.java | 4 |
4 files changed, 13 insertions, 8 deletions
diff --git a/qadevOOo/runner/complexlib/Assurance.java b/qadevOOo/runner/complexlib/Assurance.java index 980ede95f052..b250c6326dbd 100644 --- a/qadevOOo/runner/complexlib/Assurance.java +++ b/qadevOOo/runner/complexlib/Assurance.java @@ -409,9 +409,9 @@ public class Assurance assure(msg, false, cont); } - /** - * @deprecated - */ +// /** +// * @deprecated +// */ // protected void addResult(String message, boolean state) { // String msg = message + " - " + state; // this.state &= state; diff --git a/qadevOOo/runner/complexlib/ComplexTestCase.java b/qadevOOo/runner/complexlib/ComplexTestCase.java index b15224bc503f..68d6755056fd 100644 --- a/qadevOOo/runner/complexlib/ComplexTestCase.java +++ b/qadevOOo/runner/complexlib/ComplexTestCase.java @@ -190,7 +190,7 @@ public abstract class ComplexTestCase extends Assurance implements ComplexTest if (th.isAlive()) { log.println("Destroy " + mTestMethodName); - th.destroy(); + th.stopRunning(); subEntry.State = "Test did sleep for " + (m_nThreadTimeOut / 1000) + " seconds and has been killed!"; subEntry.hasErrorMsg = true; subEntry.ErrorMsg = subEntry.State; diff --git a/qadevOOo/runner/complexlib/MethodThread.java b/qadevOOo/runner/complexlib/MethodThread.java index e068323fd41e..418be5cbf7bf 100644 --- a/qadevOOo/runner/complexlib/MethodThread.java +++ b/qadevOOo/runner/complexlib/MethodThread.java @@ -95,9 +95,18 @@ public class MethodThread extends Thread /** * Stop the running method. + * @deprecated */ public void destroy() { + stop(); + } + + /** + * Stop the running method. + */ + public void stopRunning() + { try { interrupt(); diff --git a/qadevOOo/runner/graphical/GlobalLogWriter.java b/qadevOOo/runner/graphical/GlobalLogWriter.java index 478d3323abda..65d731e02557 100644 --- a/qadevOOo/runner/graphical/GlobalLogWriter.java +++ b/qadevOOo/runner/graphical/GlobalLogWriter.java @@ -44,10 +44,6 @@ public class GlobalLogWriter get().println(_sMsg); } - /** - * @deprecated use GlobalLogWriter.println(...) direct - * @return - */ protected static synchronized LogWriter get() { if (m_aGlobalLogWriter == null) |