You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by te...@apache.org on 2007/10/25 16:45:48 UTC
svn commit: r588245 [10/10] - in /harmony/enhanced/classlib/branches/java6:
depends/build/ depends/files/ make/
modules/annotation/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/
modules/archive/ modules/archive/src/main/java/ja...
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/JTextPaneTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/JTextPaneTest.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/JTextPaneTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/JTextPaneTest.java Thu Oct 25 07:44:56 2007
@@ -427,26 +427,26 @@
AttributeSet attributes;
textPane.setCaretPosition(1);
attrs = textPane.getInputAttributes();
- assertAttrubutes(attrs, false, false, true, false, false, true);
+ assertAttributes(attrs, false, false, true, false, false, true);
textPane.insertComponent(new JButton("Format C:\\>"));
- assertAttrubutes(attrs, false, false, false, false, false, false);
+ assertAttributes(attrs, false, false, false, false, false, false);
assertNull(StyleConstants.getComponent(attrs));
attributes = textPane.getStyledDocument().getCharacterElement(1).getAttributes();
- assertAttrubutes(attributes, false, false, false, false, false, false);
+ assertAttributes(attributes, false, false, false, false, false, false);
assertNotNull(StyleConstants.getComponent(attributes));
attrs = new SimpleAttributeSet(attributes);
StyleConstants.setUnderline(attrs, true);
textPane.getStyledDocument().setCharacterAttributes(1, 1, attrs, true);
textPane.setCaretPosition(1);
- assertAttrubutes(textPane.getInputAttributes(), false, false, true, false, false, true);
+ assertAttributes(textPane.getInputAttributes(), false, false, true, false, false, true);
textPane.select(2, 2);
- assertAttrubutes(textPane.getInputAttributes(), false, false, false, false, false, true);
+ assertAttributes(textPane.getInputAttributes(), false, false, false, false, false, true);
textPane.replaceSelection("*");
attrs = textPane.getInputAttributes();
- assertAttrubutes(attrs, false, false, false, false, false, true);
+ assertAttributes(attrs, false, false, false, false, false, true);
assertNull(StyleConstants.getComponent(attrs));
attributes = textPane.getStyledDocument().getCharacterElement(2).getAttributes();
- assertAttrubutes(attributes, false, false, false, false, false, true);
+ assertAttributes(attributes, false, false, false, false, false, true);
assertNull(StyleConstants.getComponent(attributes));
}
@@ -454,7 +454,7 @@
textPane.setEditable(false);
textPane.setCaretPosition(3);
attrs = textPane.getInputAttributes();
- assertAttrubutes(attrs, false, false, true, false, false, true);
+ assertAttributes(attrs, false, false, true, false, false, true);
textPane.insertIcon(new Icon() {
public void paintIcon(Component c, Graphics g, int x, int y) {
g.drawRect(x, y, getIconWidth(), getIconHeight());
@@ -468,12 +468,12 @@
return 40;
}
});
- assertAttrubutes(attrs, false, false, false, false, false, false);
+ assertAttributes(attrs, false, false, false, false, false, false);
Element iconElement = textPane.getStyledDocument().getDefaultRootElement()
.getElement(0).getElement(1);
AttributeSet attributes = iconElement.getAttributes();
assertNotNull(attributes.getAttribute(StyleConstants.IconAttribute));
- assertAttrubutes(attributes, false, false, false, false, false, false);
+ assertAttributes(attributes, false, false, false, false, false, false);
}
public void testReplaceSelection() throws BadLocationException {
@@ -540,11 +540,11 @@
textPane.replaceSelection("3");
attrs = new SimpleAttributeSet(textPane.getStyledDocument().getCharacterElement(1)
.getAttributes());
- assertAttrubutes(attrs, false, false, false, false, false, false);
+ assertAttributes(attrs, false, false, false, false, false, false);
assertNotNull(StyleConstants.getIcon(attrs));
attrs = new SimpleAttributeSet(textPane.getStyledDocument().getCharacterElement(2)
.getAttributes());
- assertAttrubutes(attrs, false, false, false, false, false, false);
+ assertAttributes(attrs, false, false, false, false, false, false);
assertNull(StyleConstants.getIcon(attrs));
}
@@ -597,7 +597,7 @@
}
}
- private void assertAttrubutes(final AttributeSet attrs, final boolean isBold,
+ private void assertAttributes(final AttributeSet attrs, final boolean isBold,
final boolean isItalic, final boolean isStrikeThrough, final boolean isSubscript,
final boolean isSuperScript, final boolean isUnderline) {
assertEquals(isBold, StyleConstants.isBold(attrs));
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicTextUITest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicTextUITest.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicTextUITest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicTextUITest.java Thu Oct 25 07:44:56 2007
@@ -283,7 +283,7 @@
* rootView.getAlignment(View.Y_AXIS));
* assertNull(rootView.getAttributes());
*
- * //has not null AttrributeSet Dimension dimension =
+ * //has not null AttributeSet Dimension dimension =
* ui.getMaximumSize(jta);
*
* //assertTrue(rintSpec(dimension.width) == //
@@ -774,4 +774,4 @@
Object actionName = im.get(im.keys()[0]);
assertNotNull(am.get(actionName));
}
-}
\ No newline at end of file
+}
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/plaf/multi/MultiLookAndFeelTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/plaf/multi/MultiLookAndFeelTest.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/plaf/multi/MultiLookAndFeelTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/plaf/multi/MultiLookAndFeelTest.java Thu Oct 25 07:44:56 2007
@@ -80,7 +80,7 @@
/*
* Test method for 'javax.swing.plaf.multi.MultiLookAndFeel.getDefaults()'
- * Defaults contains referenses to Multi classes only
+ * Defaults contains references to Multi classes only
*/
public void testGetDefaults() {
assertEquals(mlaf.getDefaults().get("ButtonUI"), //$NON-NLS-1$
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/AbstractDocument_ListenerTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/AbstractDocument_ListenerTest.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/AbstractDocument_ListenerTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/AbstractDocument_ListenerTest.java Thu Oct 25 07:44:56 2007
@@ -115,7 +115,7 @@
}
/**
- * Helper method which constracts the array before calling its
+ * Helper method which constructs the array before calling its
* counterpart to perform real checking.
*
* @param change true if changeUpdate is supposed to be called
@@ -388,4 +388,4 @@
doc.remove(0, 2);
checkCalledEvents(false, false, true, true);
}
-}
\ No newline at end of file
+}
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/AbstractDocument_UpdateTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/AbstractDocument_UpdateTest.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/AbstractDocument_UpdateTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/AbstractDocument_UpdateTest.java Thu Oct 25 07:44:56 2007
@@ -304,7 +304,7 @@
/**
* Tests if RUN_DIRECTION property has any influence on
- * bidirectional algorythm in AbstractDocument.
+ * bidirectional algorithm in AbstractDocument.
*/
public void testInsertUpdate10() throws BadLocationException {
doc.putProperty(TextAttribute.RUN_DIRECTION, TextAttribute.RUN_DIRECTION_RTL);
@@ -318,7 +318,7 @@
/**
* Tests if RUN_DIRECTION attribute set on text inserted has any
- * influence on bidirectional algorythm in AbstractDocument.
+ * influence on bidirectional algorithm in AbstractDocument.
*/
public void testInsertUpdate11() throws BadLocationException {
StyleContext context = (StyleContext) doc.getAttributeContext();
@@ -341,7 +341,7 @@
/**
* Tests if RUN_DIRECTION property has any influence on
- * bidirectional algorythm in AbstractDocument.
+ * bidirectional algorithm in AbstractDocument.
*/
public void testInsertUpdate12() throws BadLocationException {
doc.insertString(0, "kkk", null);
@@ -455,4 +455,4 @@
assertEquals(3, removeEdit.getChildrenAdded().length);
assertEquals(3, removeEdit.getChildrenRemoved().length);
}
-}
\ No newline at end of file
+}
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/DefaultStyledDocument_ElementBuffer_Specs3Test.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/DefaultStyledDocument_ElementBuffer_Specs3Test.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/DefaultStyledDocument_ElementBuffer_Specs3Test.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/DefaultStyledDocument_ElementBuffer_Specs3Test.java Thu Oct 25 07:44:56 2007
@@ -115,7 +115,7 @@
public void check(final Element element) {
if (attrs == null) {
- assertEquals("Attibute count", 0, element.getAttributes().getAttributeCount());
+ assertEquals("Attribute count", 0, element.getAttributes().getAttributeCount());
} else {
assertTrue("Attributes", attrs.isEqual(element.getAttributes()));
}
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/GapContentTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/GapContentTest.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/GapContentTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/GapContentTest.java Thu Oct 25 07:44:56 2007
@@ -222,7 +222,7 @@
}
// Regression for HARMONY-2566
- public void testGetCharsMaxInterger() {
+ public void testGetCharsMaxInteger() {
try {
content.getChars(1, Integer.MAX_VALUE, null);
fail("BadLocationException is expected");
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/StyleContext_AddAttrTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/StyleContext_AddAttrTest.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/StyleContext_AddAttrTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/StyleContext_AddAttrTest.java Thu Oct 25 07:44:56 2007
@@ -63,7 +63,7 @@
}
/**
- * Add two diffrent key/value pair to an empty set.
+ * Add two different key/value pair to an empty set.
* Check the return instances are different.
*/
public void testAddAttributeDiff() {
@@ -190,4 +190,4 @@
protected void setUp() {
sc = StyleContextTest.sc = new StyleContext();
}
-}
\ No newline at end of file
+}
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/StyledEditorKit_StyledTextActionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/StyledEditorKit_StyledTextActionTest.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/StyledEditorKit_StyledTextActionTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/StyledEditorKit_StyledTextActionTest.java Thu Oct 25 07:44:56 2007
@@ -74,7 +74,7 @@
public void testGetEditor() {
jep = new JEditorPane();
assertEquals(jep, action.getEditor(new ActionEvent(jep, 1, "...")));
- //Really this is need to check NullPointerExceoption, but ...
+ //Really this needs to check NullPointerException, but ...
}
public void testSetParagraphAttributes() {
@@ -249,4 +249,4 @@
Element elem = StyledEditorKitTest.getElementByOffset(doc, offset);
return (elem == null) ? null : elem.getAttributes();
}
-}
\ No newline at end of file
+}
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/View_ChangesTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/View_ChangesTest.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/View_ChangesTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/View_ChangesTest.java Thu Oct 25 07:44:56 2007
@@ -936,7 +936,7 @@
assertEquals("added and created are different", added.length, viewsCreatedElements
.size());
for (int i = 0; i < added.length; i++) {
- assertSame("Elemets different @ " + i, added[i], viewsCreatedElements.get(i));
+ assertSame("Elements different @ " + i, added[i], viewsCreatedElements.get(i));
}
assertEquals("Child view count is unexpected", count, view.getViewCount());
assertEquals("Replace index is unexpected", docEvent.getChange(root).getIndex(),
@@ -951,4 +951,4 @@
public void testForwardUpdate() {
// tested in testInsertUpdate05
}*/
-}
\ No newline at end of file
+}
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/html/FormViewTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/html/FormViewTest.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/html/FormViewTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/html/FormViewTest.java Thu Oct 25 07:44:56 2007
@@ -725,7 +725,7 @@
doc = new HTMLDocument();
editorPane.setDocument(doc);
htmlEditorKit.read(reader, doc, 0);
- // 1. Test checkbox button. Succsessful should be only checked buttons.
+ // 1. Test checkbox button. Successful should be only checked buttons.
src = new StringBuffer();
src.append("<HTML><HEAD></HEAD><BODY> Test");
@@ -778,7 +778,7 @@
doc = new HTMLDocument();
editorPane.setDocument(doc);
htmlEditorKit.read(reader, doc, 0);
- // 1. Test submit button. Succsessful should be only armed button.
+ // 1. Test submit button. Successful should be only armed button.
if (isHarmony()) {
/**
@@ -816,7 +816,7 @@
// 1. Test disable attribute in
// a) BUTTON
// b) OPTGROUP
- // 2. Test submit button. Succsessful should be only armed button.
+ // 2. Test submit button. Successful should be only armed button.
}
src = new StringBuffer();
@@ -833,7 +833,7 @@
editorPane.setDocument(doc);
htmlEditorKit.read(reader, doc, 0);
// TODO
- // 1. Test checkbox button. Succsessful should be only checked buttons.
+ // 1. Test checkbox button. Successful should be only checked buttons.
src = new StringBuffer();
src.append("<HTML><HEAD></HEAD><BODY> Test");
@@ -852,7 +852,7 @@
htmlEditorKit.read(reader, doc, 0);
// TODO
// 1. Test radioButton.
- // a) For buttons with the same name succsessful should be only selected
+ // a) For buttons with the same name successful should be only selected
// button.
// b) Test Unchecked buttons
@@ -872,7 +872,7 @@
editorPane.setDocument(doc);
htmlEditorKit.read(reader, doc, 0);
// TODO
- // 1. Succsessful should be only selected items.
+ // 1. Successful should be only selected items.
src = new StringBuffer();
src.append("<HTML><HEAD></HEAD><BODY> Test");
@@ -885,7 +885,7 @@
editorPane.setDocument(doc);
htmlEditorKit.read(reader, doc, 0);
// TODO
- // 1. File is succsessful element
+ // 1. File is successful element
// TODO
// 1. If current value of element is unset, element may considered as
@@ -902,7 +902,7 @@
editorPane.setDocument(doc);
htmlEditorKit.read(reader, doc, 0);
// TODO
- // 1. Reset isn't succsessful element
+ // 1. Reset isn't successful element
src = new StringBuffer();
src.append("<HTML><HEAD></HEAD><BODY> Test");
@@ -915,7 +915,7 @@
editorPane.setDocument(doc);
htmlEditorKit.read(reader, doc, 0);
// TODO
- // 1. OBJECT with attrubute "declare" isn't succsessful element.
+ // 1. OBJECT with attribute "declare" isn't successful element.
// TODO
// 1. Tests on invisible elements.
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/html/parser/DTDTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/html/parser/DTDTest.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/html/parser/DTDTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/html/parser/DTDTest.java Thu Oct 25 07:44:56 2007
@@ -281,7 +281,7 @@
ContentModel contentModel = null;
String[] exclusions = new String[] {HTML, BASE};
String[] inclusions = new String[] {APPLET, BODY};
- AttributeList attl = new AttributeList("atttibuteList");
+ AttributeList attl = new AttributeList("attributeList");
Element elem = dtd.defElement(name, type, omitStart, omitEnd,
contentModel, exclusions, inclusions,
attl);
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/html/parser/Utils.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/html/parser/Utils.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/html/parser/Utils.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/html/parser/Utils.java Thu Oct 25 07:44:56 2007
@@ -268,7 +268,7 @@
final int type,
final String data,
final boolean isGeneral,
- final boolean isParametr) {
+ final boolean isParameter) {
TestCase.assertEquals(name, entity.name);
//TestCase.assertEquals(type, entity.type);
TestCase.assertEquals(data, String.valueOf(entity.data));
@@ -276,7 +276,7 @@
TestCase.assertEquals(type, entity.getType()); //TODO 65536
TestCase.assertEquals(data, entity.getString());
TestCase.assertEquals(isGeneral, entity.isGeneral());
- TestCase.assertEquals(isParametr, entity.isParameter());
+ TestCase.assertEquals(isParameter, entity.isParameter());
}
public static void checkEntity(final Entity entity,
@@ -284,14 +284,14 @@
final int type,
final char data,
final boolean isGeneral,
- final boolean isParametr) {
+ final boolean isParameter) {
TestCase.assertEquals(name, entity.name);
TestCase.assertEquals(1, entity.data.length);
TestCase.assertEquals(data, entity.data[0]);
TestCase.assertEquals(name, entity.getName());
TestCase.assertEquals(type, entity.getType()); //TODO 65536
TestCase.assertEquals(isGeneral, entity.isGeneral());
- TestCase.assertEquals(isParametr, entity.isParameter());
+ TestCase.assertEquals(isParameter, entity.isParameter());
}
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/tree/DefaultTreeCellRendererTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/tree/DefaultTreeCellRendererTest.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/tree/DefaultTreeCellRendererTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/tree/DefaultTreeCellRendererTest.java Thu Oct 25 07:44:56 2007
@@ -222,12 +222,12 @@
renderer.getTreeCellRendererComponent(new JTree(), "value", true, true, true, 0, false);
JLabel label = new JLabel("value", renderer.getDefaultLeafIcon(), SwingConstants.LEFT);
label.setFont(renderer.getFont());
- Dimension baseDimenstion = label.getPreferredSize();
+ Dimension baseDimension = label.getPreferredSize();
if (isHarmony()) {
- assertEquals(new Dimension(baseDimenstion.width + 2, baseDimenstion.height),
+ assertEquals(new Dimension(baseDimension.width + 2, baseDimension.height),
renderer.getPreferredSize());
} else {
- assertEquals(new Dimension(baseDimenstion.width + 3, baseDimenstion.height),
+ assertEquals(new Dimension(baseDimension.width + 3, baseDimension.height),
renderer.getPreferredSize());
}
}
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/tree/FixedHeightLayoutCacheTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/tree/FixedHeightLayoutCacheTest.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/tree/FixedHeightLayoutCacheTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/tree/FixedHeightLayoutCacheTest.java Thu Oct 25 07:44:56 2007
@@ -82,7 +82,7 @@
assertEquals(200, cache.getRowHeight());
try {
cache.setRowHeight(0);
- fail("no excepttion has been thrown");
+ fail("no exception has been thrown");
} catch (IllegalArgumentException e) {
}
}
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/org/apache/harmony/swing/tests/javax/swing/text/parser/ContentModelCompatilityTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/org/apache/harmony/swing/tests/javax/swing/text/parser/ContentModelCompatilityTest.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/org/apache/harmony/swing/tests/javax/swing/text/parser/ContentModelCompatilityTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/org/apache/harmony/swing/tests/javax/swing/text/parser/ContentModelCompatilityTest.java Thu Oct 25 07:44:56 2007
@@ -708,7 +708,7 @@
* 'org.apache.harmony.swing.tests.javax.swing.text.parser.ContentModel.ContentModel(int,
* ContentModel)' ContentModel(Element( "1",0,true,true,null,null,null,null ,
* and a contentmodel is created. Then ContentModel(0,contentmodel) is
- * instanciated It checks if an instance is created, content is equal to el
+ * instantiated It checks if an instance is created, content is equal to el
* ,type is 0 and next is null.
*/
public void testContentModelIntContentModel036() {
@@ -2274,7 +2274,7 @@
* Test method for 'org.apache.harmony.swing.tests.javax.swing.text.parser.ContentModel.toString()'
* ContentModel(Element( "1",0,true,true,null,null,null,null , and a
* contentmodel is created. Then ContentModel(0,contentmodel) is
- * instanciated Expected result is "1"
+ * instantiated Expected result is "1"
*/
public void testToString024() {
try {
@@ -2952,7 +2952,7 @@
/**
* Test method for 'org.apache.harmony.swing.tests.javax.swing.text.parser.ContentModel.first()'
* ContentModel(Element( "1",0,true,true,null,null,null,null)) Then
- * ContentModel(0,contentmodel) is instanciated Expected: Element(
+ * ContentModel(0,contentmodel) is instantiated Expected: Element(
* "1",0,true,true,null,null,null,null)
*/
public void testFirst024() {
Modified: harmony/enhanced/classlib/branches/java6/modules/text/src/main/native/text/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/text/src/main/native/text/unix/makefile?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/text/src/main/native/text/unix/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/text/src/main/native/text/unix/makefile Thu Oct 25 07:44:56 2007
@@ -25,7 +25,7 @@
BUILDFILES = $(SHAREDSUB)text_copyright.o $(SHAREDSUB)BidiWrapper.o
ifneq ($(HY_ZIP_API),true)
-MDLLIBFILES += $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
endif
MDLLIBFILES += \
Modified: harmony/enhanced/classlib/branches/java6/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/RuleBasedCollatorTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/RuleBasedCollatorTest.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/RuleBasedCollatorTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/RuleBasedCollatorTest.java Thu Oct 25 07:44:56 2007
@@ -248,7 +248,7 @@
assertFalse(coll.equals("A", "\uFF21"));
}
- public void testGetAvaiableLocales() {
+ public void testGetAvailableLocales() {
// Locale[] locales = Collator.getAvailableLocales();
// for (int i = 0; i < locales.length; i++) {
// Locale locale = locales[i];
@@ -306,4 +306,4 @@
}
}
-}
\ No newline at end of file
+}
Modified: harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/KeyManagerFactory.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/KeyManagerFactory.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/KeyManagerFactory.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/KeyManagerFactory.java Thu Oct 25 07:44:56 2007
@@ -87,7 +87,7 @@
public static final KeyManagerFactory getInstance(String algorithm)
throws NoSuchAlgorithmException {
if (algorithm == null) {
- throw new NullPointerException("algorith is null");
+ throw new NullPointerException("algorithm is null");
}
synchronized (engine) {
engine.getInstance(algorithm, null);
@@ -127,7 +127,7 @@
throw new IllegalArgumentException("Provider is null");
}
if (algorithm == null) {
- throw new NullPointerException("algorith is null");
+ throw new NullPointerException("algorithm is null");
}
synchronized (engine) {
engine.getInstance(algorithm, provider, null);
@@ -183,4 +183,4 @@
}
});
}
-}
\ No newline at end of file
+}
Modified: harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/HandshakeIODataStream.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/HandshakeIODataStream.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/HandshakeIODataStream.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/HandshakeIODataStream.java Thu Oct 25 07:44:56 2007
@@ -174,7 +174,7 @@
/**
* Appends the income data to be read by handshake protocol.
- * The attempts to overflow the buffer by meens of this methos
+ * The attempts to overflow the buffer by means of this methods
* seem to be futile because of:
* 1. The SSL protocol specifies the maximum size of the record
* and record protocol does not pass huge messages.
Modified: harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/JSSEProvider.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/JSSEProvider.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/JSSEProvider.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/JSSEProvider.java Thu Oct 25 07:44:56 2007
@@ -63,7 +63,7 @@
* TLS_DH_anon_WITH_DES_CBC_SHA
* TLS_DH_anon_WITH_3DES_EDE_CBC_SHA
*
- * The real set of availible cipher suites depends on set of availible
+ * The real set of available cipher suites depends on set of available
* crypto algorithms. These algorithms must be provided by some crypto
* provider.
*
Modified: harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLRecordProtocol.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLRecordProtocol.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLRecordProtocol.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLRecordProtocol.java Thu Oct 25 07:44:56 2007
@@ -186,7 +186,7 @@
/**
* Depending on the Connection State (Session) encrypts and compress
- * the provided data, and packs it into TLSCiphertext structute.
+ * the provided data, and packs it into TLSCiphertext structure.
* @param content_type: int
* @param fragment: byte[]
* @return ssl packet created over the current connection state
@@ -198,7 +198,7 @@
/**
* Depending on the Connection State (Session) encrypts and compress
- * the provided data, and packs it into TLSCiphertext structute.
+ * the provided data, and packs it into TLSCiphertext structure.
* @param content_type: int
* @param fragment: byte[]
* @return ssl packet created over the current connection state
Modified: harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketInputStream.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketInputStream.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketInputStream.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketInputStream.java Thu Oct 25 07:44:56 2007
@@ -67,7 +67,7 @@
this.owner = owner;
}
- // The helper delivering the applicatin data from the record layer
+ // The helper delivering the application data from the record layer
protected Adapter dataPoint = new Adapter();
/**
Modified: harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImpl.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImpl.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImpl.java Thu Oct 25 07:44:56 2007
@@ -153,7 +153,7 @@
if (clientCert.certs.length == 0) {
if (parameters.getNeedClientAuth()) {
fatalAlert(AlertProtocol.HANDSHAKE_FAILURE,
- "HANDSHAKE FAILURE: no client certificate recived");
+ "HANDSHAKE FAILURE: no client certificate received");
}
} else {
String authType = clientCert.certs[0].getPublicKey()