diff options
author | Noel Grandin <noel@peralex.com> | 2014-08-06 08:55:09 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-08-12 09:41:28 +0200 |
commit | 0477e6c39b7ce8b7f6560fbf222c19fe4f358dc8 (patch) | |
tree | 218eba20dd23c6a865cf01aa7532bf1261a69bc8 /qadevOOo/tests/java/ifc/style | |
parent | e2e55a7c49079dfd896da6515b98d451e4c8735b (diff) |
java: add @Override annotation to overriding methods
Change-Id: I086964c6f6ce52c60c52b6dbc445d3c21d22c80a
Diffstat (limited to 'qadevOOo/tests/java/ifc/style')
8 files changed, 21 insertions, 0 deletions
diff --git a/qadevOOo/tests/java/ifc/style/_CharacterProperties.java b/qadevOOo/tests/java/ifc/style/_CharacterProperties.java index b5f9234657d5..5a6114888f15 100644 --- a/qadevOOo/tests/java/ifc/style/_CharacterProperties.java +++ b/qadevOOo/tests/java/ifc/style/_CharacterProperties.java @@ -106,6 +106,7 @@ public class _CharacterProperties extends MultiPropertyTest { public void _CharHeight() { testProperty("CharHeight", new PropertyTester() { + @Override protected Object getNewValue(String propName, Object old) { if (utils.isVoid(old)) { return new Float(10) ; @@ -121,6 +122,7 @@ public class _CharacterProperties extends MultiPropertyTest { * Switches between two JPG images' URLs. */ protected PropertyTester URLTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { if (oldValue.equals("http://www.sun.com")) return "http://www.openoffice.org"; else @@ -156,6 +158,7 @@ public class _CharacterProperties extends MultiPropertyTest { * between 'Citation' and 'Emphasis' names. */ protected PropertyTester StyleTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { String oStyleName1 = (String) tEnv.getObjRelation("STYLENAME1"); String oStyleName2 = (String) tEnv.getObjRelation("STYLENAME2"); @@ -178,6 +181,7 @@ public class _CharacterProperties extends MultiPropertyTest { * 'Citation' and 'Emphasis' names. */ protected PropertyTester StylesTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { if (utils.isVoid(oldValue) || (oldValue.equals("Standard"))) return new String[] {"Citation"}; else @@ -259,6 +263,7 @@ public class _CharacterProperties extends MultiPropertyTest { * Custom tester for the ruby text property. */ protected PropertyTester RubyTextTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) throws java.lang.IllegalArgumentException { if (utils.isVoid(oldValue)) { diff --git a/qadevOOo/tests/java/ifc/style/_CharacterPropertiesComplex.java b/qadevOOo/tests/java/ifc/style/_CharacterPropertiesComplex.java index 61339be56c1a..2582ff8c5bec 100644 --- a/qadevOOo/tests/java/ifc/style/_CharacterPropertiesComplex.java +++ b/qadevOOo/tests/java/ifc/style/_CharacterPropertiesComplex.java @@ -52,6 +52,7 @@ public class _CharacterPropertiesComplex extends MultiPropertyTest { /** * Forces environment recreation. */ + @Override protected void after() { disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/style/_PageProperties.java b/qadevOOo/tests/java/ifc/style/_PageProperties.java index 929c9ca2b893..9a7f7312ba90 100644 --- a/qadevOOo/tests/java/ifc/style/_PageProperties.java +++ b/qadevOOo/tests/java/ifc/style/_PageProperties.java @@ -38,6 +38,7 @@ public class _PageProperties extends MultiPropertyTest { * Switch on Header and Footer properties * so all props can be tested. */ + @Override protected void before() { try { oObj.setPropertyValue("HeaderIsOn", Boolean.TRUE); diff --git a/qadevOOo/tests/java/ifc/style/_PageStyle.java b/qadevOOo/tests/java/ifc/style/_PageStyle.java index 08fae5901b7c..64503469d1ff 100644 --- a/qadevOOo/tests/java/ifc/style/_PageStyle.java +++ b/qadevOOo/tests/java/ifc/style/_PageStyle.java @@ -32,6 +32,7 @@ public class _PageStyle extends _PageProperties { * Test is used from _PageProperties * @see ifc.style._PageProperties */ + @Override public void _PrinterPaperTray() { super._PrinterPaperTray(); } @@ -41,6 +42,7 @@ public class _PageStyle extends _PageProperties { * Test is used from _PageProperties * @see ifc.style._PageProperties */ + @Override public void _UserDefinedAttributes() { super._UserDefinedAttributes(); } diff --git a/qadevOOo/tests/java/ifc/style/_ParagraphProperties.java b/qadevOOo/tests/java/ifc/style/_ParagraphProperties.java index 9f4ba6ad8806..335d8968e6bf 100644 --- a/qadevOOo/tests/java/ifc/style/_ParagraphProperties.java +++ b/qadevOOo/tests/java/ifc/style/_ParagraphProperties.java @@ -105,6 +105,7 @@ public class _ParagraphProperties extends MultiPropertyTest { * 'Numbering 1' and 'Numbering 2' styles. */ protected PropertyTester NumberingStyleTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) throws java.lang.IllegalArgumentException { if ((oldValue != null) && (oldValue.equals("Numbering 1"))) { @@ -120,6 +121,7 @@ public class _ParagraphProperties extends MultiPropertyTest { * 'Salutation' and 'Heading' styles. */ protected PropertyTester charStyleTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { if (!utils.isVoid(oldValue) && (oldValue.equals("Example"))) { return "Emphasis"; @@ -134,6 +136,7 @@ public class _ParagraphProperties extends MultiPropertyTest { * 'Salutation' and 'Heading' styles. */ protected PropertyTester ParaStyleTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { if (!utils.isVoid(oldValue) && (oldValue.equals("Heading"))) { return "Salutation"; @@ -148,6 +151,7 @@ public class _ParagraphProperties extends MultiPropertyTest { * 'HTML' and 'Standard' descriptor names. */ protected PropertyTester PageDescTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { if (!util.utils.isVoid(oldValue) && (oldValue.equals("Default"))) { @@ -164,6 +168,7 @@ public class _ParagraphProperties extends MultiPropertyTest { * be specified. Switches between two different values. */ protected PropertyTester ShortTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { if ((oldValue != null) && (oldValue.equals(new Short((short) 0)))) { @@ -180,6 +185,7 @@ public class _ParagraphProperties extends MultiPropertyTest { * be specified. Switches between true and false. */ protected PropertyTester BooleanTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { if ((oldValue != null) && (oldValue.equals(new Boolean(false)))) { @@ -195,6 +201,7 @@ public class _ParagraphProperties extends MultiPropertyTest { * Switches between two JPG images' URLs. */ protected PropertyTester URLTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { if (oldValue.equals(util.utils.getFullTestURL("space-metal.jpg"))) { return util.utils.getFullTestURL("crazy-blue.jpg"); @@ -209,11 +216,13 @@ public class _ParagraphProperties extends MultiPropertyTest { /** * Creates tester for 'NumberingRules' depending on relation. */ + @Override public void before() { final Object nRules = tEnv.getObjRelation("NRULES"); if (nRules != null) { rules = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { return nRules; } diff --git a/qadevOOo/tests/java/ifc/style/_ParagraphPropertiesAsian.java b/qadevOOo/tests/java/ifc/style/_ParagraphPropertiesAsian.java index c82b8e0f0d32..b63fa9c2fd63 100644 --- a/qadevOOo/tests/java/ifc/style/_ParagraphPropertiesAsian.java +++ b/qadevOOo/tests/java/ifc/style/_ParagraphPropertiesAsian.java @@ -38,6 +38,7 @@ public class _ParagraphPropertiesAsian extends MultiPropertyTest { * be specified. Switches between true and false. */ protected PropertyTester BooleanTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { if ((oldValue != null) && (oldValue.equals(new Boolean(false)))) { diff --git a/qadevOOo/tests/java/ifc/style/_ParagraphPropertiesComplex.java b/qadevOOo/tests/java/ifc/style/_ParagraphPropertiesComplex.java index cb250eadac09..a05b4d2946cb 100644 --- a/qadevOOo/tests/java/ifc/style/_ParagraphPropertiesComplex.java +++ b/qadevOOo/tests/java/ifc/style/_ParagraphPropertiesComplex.java @@ -30,6 +30,7 @@ public class _ParagraphPropertiesComplex extends MultiPropertyTest { protected PropertyTester WritingModeTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { if ((oldValue != null) && (oldValue.equals(new Short(com.sun.star.text.WritingMode2.LR_TB)))) return new Short(com.sun.star.text.WritingMode2.PAGE); else diff --git a/qadevOOo/tests/java/ifc/style/_XStyle.java b/qadevOOo/tests/java/ifc/style/_XStyle.java index 3de792261ce1..ce031f9f9e5a 100644 --- a/qadevOOo/tests/java/ifc/style/_XStyle.java +++ b/qadevOOo/tests/java/ifc/style/_XStyle.java @@ -50,6 +50,7 @@ public class _XStyle extends MultiMethodTest { * Retrieves object relations. * @throws StatusException If one of relations not found. */ + @Override public void before() { oMyStyle = (XStyle) tEnv.getObjRelation("PoolStyle"); if (oMyStyle == null) throw new StatusException |