You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ap...@apache.org on 2007/03/01 14:24:06 UTC
svn commit: r513311 [3/3] - in
/harmony/enhanced/classlib/trunk/modules/swing/src/main/java:
common/javax/swing/ common/javax/swing/border/ common/javax/swing/event/
common/javax/swing/filechooser/ common/javax/swing/plaf/
common/javax/swing/plaf/basic...
Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/FlowView.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/FlowView.java?view=diff&rev=513311&r1=513310&r2=513311
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/FlowView.java (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/FlowView.java Thu Mar 1 05:24:01 2007
@@ -29,6 +29,8 @@
import javax.swing.event.DocumentEvent;
import javax.swing.text.Position.Bias;
+import org.apache.harmony.x.swing.internal.nls.Messages;
+
public abstract class FlowView extends BoxView {
public static class FlowStrategy {
private static FlowStrategy sharedStrategy;
@@ -232,8 +234,7 @@
}
public void paint(final Graphics g, final Shape shape) {
- throw new UnsupportedOperationException("Not applicable to "
- + "Layout Pool");
+ throw new UnsupportedOperationException(Messages.getString("swing.8B")); //$NON-NLS-1$
}
public void preferenceChanged(final View child,
@@ -272,8 +273,7 @@
protected View getViewAtPoint(final int x, final int y,
final Rectangle alloc) {
- throw new UnsupportedOperationException("Not applicable to "
- + "Layout Pool");
+ throw new UnsupportedOperationException(Messages.getString("swing.8B")); //$NON-NLS-1$
}
protected int getViewIndexAtPosition(final int pos) {
@@ -285,14 +285,12 @@
protected boolean isAfter(final int x, final int y,
final Rectangle rc) {
- throw new UnsupportedOperationException("Not applicable to "
- + "Layout Pool");
+ throw new UnsupportedOperationException(Messages.getString("swing.8B")); //$NON-NLS-1$
}
protected boolean isBefore(final int x, final int y,
final Rectangle rc) {
- throw new UnsupportedOperationException("Not applicable to "
- + "Layout Pool");
+ throw new UnsupportedOperationException(Messages.getString("swing.8B")); //$NON-NLS-1$
}
private float getSpanX() {
Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/GapContent.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/GapContent.java?view=diff&rev=513311&r1=513310&r2=513311
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/GapContent.java (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/GapContent.java Thu Mar 1 05:24:01 2007
@@ -29,6 +29,8 @@
import javax.swing.text.ContentPositions.DocumentMark;
import javax.swing.undo.UndoableEdit;
+import org.apache.harmony.x.swing.internal.nls.Messages;
+
@SuppressWarnings("serial")
public class GapContent
implements AbstractDocument.Content, Serializable {
@@ -140,11 +142,11 @@
throws BadLocationException {
if (length < 0) {
- throw new BadLocationException("Length must be non-negative",
+ throw new BadLocationException(Messages.getString("swing.8C"), //$NON-NLS-1$
length);
}
if (offset < 0 || length > length() - offset) {
- throw new BadLocationException("Invalid start position", offset);
+ throw new BadLocationException(Messages.getString("swing.8D"), offset); //$NON-NLS-1$
}
if (offset + length <= gapStart) {
@@ -366,7 +368,7 @@
throws BadLocationException {
if (where < 0 || where > length()) {
- throw new BadLocationException("Invalid insert position", where);
+ throw new BadLocationException(Messages.getString("swing.8E"), where); //$NON-NLS-1$
}
shiftGap(where);
@@ -396,7 +398,7 @@
if (where < 0 || where + nitems >= length()) {
- throw new BadLocationException("Invalid remove position", where);
+ throw new BadLocationException(Messages.getString("swing.7F"), where); //$NON-NLS-1$
}
if (where + nitems == gapStart) {
Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/IconView.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/IconView.java?view=diff&rev=513311&r1=513310&r2=513311
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/IconView.java (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/IconView.java Thu Mar 1 05:24:01 2007
@@ -29,6 +29,8 @@
import org.apache.harmony.awt.text.TextUtils;
+import org.apache.harmony.x.swing.internal.nls.Messages;
+
public class IconView extends View {
public IconView(final Element element) {
@@ -74,7 +76,7 @@
private void isAxisValid(final int axis) {
if (axis != X_AXIS && axis != Y_AXIS) {
- throw new IllegalArgumentException("Invalid axis: " + axis);
+ throw new IllegalArgumentException(Messages.getString("swing.00", axis)); //$NON-NLS-1$
}
}
- }
\ No newline at end of file
+ }
Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/InternationalFormatter.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/InternationalFormatter.java?view=diff&rev=513311&r1=513310&r2=513311
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/InternationalFormatter.java (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/InternationalFormatter.java Thu Mar 1 05:24:01 2007
@@ -34,6 +34,8 @@
import org.apache.harmony.awt.text.TextUtils;
+import org.apache.harmony.x.swing.internal.nls.Messages;
+
public class InternationalFormatter extends DefaultFormatter {
@@ -179,7 +181,7 @@
}
if (!checkRange(result)) {
- throw new ParseException("the value is outside the min/max ", 0);
+ throw new ParseException(Messages.getString("swing.8F"), 0); //$NON-NLS-1$
}
return result;
}
@@ -216,4 +218,5 @@
return (format != null) ? format.format(value) : text;
}
}
+
Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/JTextComponent.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/JTextComponent.java?view=diff&rev=513311&r1=513310&r2=513311
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/JTextComponent.java (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/JTextComponent.java Thu Mar 1 05:24:01 2007
@@ -92,6 +92,8 @@
import org.apache.harmony.awt.text.TextUtils;
import org.apache.harmony.x.swing.StringConstants;
+import org.apache.harmony.x.swing.internal.nls.Messages;
+
public abstract class JTextComponent extends JComponent implements Scrollable,
Accessible {
@@ -159,8 +161,7 @@
private void checkPositions(final int i1, final int i2,
final int length) {
if (i1 < 0 || i2 < i1 || i2 > length) {
- throw new IllegalArgumentException("Wrong parameters :"
- + i1 + ", " + i2);
+ throw new IllegalArgumentException(Messages.getString("swing.90",i1, i2)); //$NON-NLS-1$
}
}
@@ -1138,8 +1139,7 @@
} else if (orientation == SwingConstants.VERTICAL) {
return rect.height;
} else {
- throw new IllegalArgumentException("Invalid orientation: "
- + orientation);
+ throw new IllegalArgumentException(Messages.getString("swing.41", orientation)); //$NON-NLS-1$
}
}
@@ -1170,8 +1170,7 @@
} else if (orientation == SwingConstants.VERTICAL) {
return rect.height / DEFAULT_UNIT_NUMBER;
} else {
- throw new IllegalArgumentException("Invalid orientation: "
- + orientation);
+ throw new IllegalArgumentException(Messages.getString("swing.41", orientation)); //$NON-NLS-1$
}
}
@@ -1242,7 +1241,7 @@
return;
}
if (pos < 0 || pos > document.getLength()) {
- throw new IllegalArgumentException("bad position: " + pos);
+ throw new IllegalArgumentException(Messages.getString("swing.91", pos)); //$NON-NLS-1$
}
caret.moveDot(pos);
}
@@ -1369,7 +1368,7 @@
return;
}
if (pos < 0 || pos > document.getLength()) {
- throw new IllegalArgumentException("bad position: " + pos);
+ throw new IllegalArgumentException(Messages.getString("swing.91", pos)); //$NON-NLS-1$
}
caret.setDot(pos);
}
Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/MaskFormatter.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/MaskFormatter.java?view=diff&rev=513311&r1=513310&r2=513311
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/MaskFormatter.java (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/MaskFormatter.java Thu Mar 1 05:24:01 2007
@@ -28,6 +28,8 @@
import javax.swing.text.DocumentFilter.FilterBypass;
import javax.swing.text.Position.Bias;
+import org.apache.harmony.x.swing.internal.nls.Messages;
+
public class MaskFormatter extends DefaultFormatter {
private String mask;
@@ -211,7 +213,7 @@
if (maskLength - escapeLength
- (valueContainsLiteralCharacters ? 0 : literalsLength)
< length) {
- throw new ParseException("Cann't parse value", 0);
+ throw new ParseException(Messages.getString("swing.92"), 0); //$NON-NLS-1$
}
int index = 0;
int maskIndex = 0;
@@ -243,7 +245,7 @@
if (!acceptCharacter(maskCharacter,
textCharacter,
isLiteral)) {
- throw new ParseException("Cann't parse String", index);
+ throw new ParseException(Messages.getString("swing.93"), index); //$NON-NLS-1$
}
}
@@ -300,7 +302,7 @@
int maskLength = mask.length();
int index = 0;
if (maskLength - length != escapeMask.cardinality()) {
- throw new ParseException("stringToValue passed invalid value", 0);
+ throw new ParseException(Messages.getString("swing.94"), 0); //$NON-NLS-1$
}
int accumulator = 0;
String result = "";
@@ -459,4 +461,5 @@
return result;
}
}
+
Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/ParagraphView.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/ParagraphView.java?view=diff&rev=513311&r1=513310&r2=513311
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/ParagraphView.java (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/ParagraphView.java Thu Mar 1 05:24:01 2007
@@ -29,6 +29,8 @@
import org.apache.harmony.awt.text.TextUtils;
+import org.apache.harmony.x.swing.internal.nls.Messages;
+
public class ParagraphView extends FlowView implements TabExpander {
private static final int DEFAULT_TAB = 72;
@@ -269,7 +271,7 @@
final int rowIndex,
final int x)
throws BadLocationException {
- throw new UnsupportedOperationException("Not implemented");
+ throw new UnsupportedOperationException(Messages.getString("swing.27")); //$NON-NLS-1$
}
protected float getPartialSize(final int startOffset,
@@ -341,7 +343,7 @@
final Bias[] biasRet)
throws BadLocationException {
if (true) {
- throw new UnsupportedOperationException("Not implemented");
+ throw new UnsupportedOperationException(Messages.getString("swing.27")); //$NON-NLS-1$
}
return TextUtils.getNextVisualPositionFrom(getTextKit(), this,
pos, b, a,
@@ -350,7 +352,7 @@
protected boolean flipEastAndWestAtEnds(final int position,
final Bias bias) {
- throw new UnsupportedOperationException("Not implemented");
+ throw new UnsupportedOperationException(Messages.getString("swing.27")); //$NON-NLS-1$
}
protected TabSet getTabSet() {
Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/PasswordView.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/PasswordView.java?view=diff&rev=513311&r1=513310&r2=513311
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/PasswordView.java (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/PasswordView.java Thu Mar 1 05:24:01 2007
@@ -29,6 +29,8 @@
import org.apache.harmony.awt.text.TextFieldKit;
import org.apache.harmony.awt.text.TextUtils;
+import org.apache.harmony.x.swing.internal.nls.Messages;
+
public class PasswordView extends FieldView {
private static final char DEFAULT_ECHO_CHAR = '*';
@@ -82,7 +84,7 @@
if (echoCharIsSet()) {
String text = getText();
if (pos < 0 || pos > text.length()) {
- throw new BadLocationException("incorrect position: " + pos,
+ throw new BadLocationException(Messages.getString("swing.95", pos), //$NON-NLS-1$
pos);
}
if (shape == null) {
@@ -151,9 +153,9 @@
final int y) throws BadLocationException {
int length = getTextLength();
if (p0 < 0) {
- throw new BadLocationException("incorrect positions: ", p0);
+ throw new BadLocationException(Messages.getString("swing.96"), p0); //$NON-NLS-1$
} else if (p1 < p0 || p1 > length) {
- throw new BadLocationException("incorrect positions: ", p1);
+ throw new BadLocationException(Messages.getString("swing.96"), p1); //$NON-NLS-1$
}
Color old = g.getColor();
Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/PlainView.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/PlainView.java?view=diff&rev=513311&r1=513310&r2=513311
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/PlainView.java (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/PlainView.java Thu Mar 1 05:24:01 2007
@@ -33,6 +33,7 @@
import org.apache.harmony.awt.text.TextKit;
import org.apache.harmony.awt.text.TextUtils;
+import org.apache.harmony.x.swing.internal.nls.Messages;
public class PlainView extends View implements TabExpander {
protected FontMetrics metrics;
@@ -59,7 +60,7 @@
return metrics.getHeight() * getElement().getElementCount();
default:
- throw new IllegalArgumentException("Invalid axis (" + axis + ")");
+ throw new IllegalArgumentException(Messages.getString("swing.00", axis)); //$NON-NLS-1$
}
}
@@ -91,7 +92,7 @@
throws BadLocationException {
if (pos < 0 || pos > getDocument().getLength() + 1) {
- throw new BadLocationException("Invalid position", pos);
+ throw new BadLocationException(Messages.getString("swing.98"), pos); //$NON-NLS-1$
}
final int lineNo = getElement().getElementIndex(pos);
Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/PlainViewI18N.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/PlainViewI18N.java?view=diff&rev=513311&r1=513310&r2=513311
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/PlainViewI18N.java (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/PlainViewI18N.java Thu Mar 1 05:24:01 2007
@@ -34,6 +34,8 @@
import org.apache.harmony.awt.text.TextKit;
import org.apache.harmony.awt.text.TextUtils;
+import org.apache.harmony.x.swing.internal.nls.Messages;
+
/**
* Represents view for displaying bidirectional text.
@@ -59,7 +61,7 @@
final int end = getEndOffset();
if (pos < start || pos > end) {
- throw new BadLocationException("Invalid position", pos);
+ throw new BadLocationException(Messages.getString("swing.98"), pos); //$NON-NLS-1$
}
getDocument().getText(pos, end - pos, paintParams.buffer);
@@ -160,7 +162,7 @@
final int start = getStartOffset();
if (pos < start || pos > getEndOffset()) {
- throw new BadLocationException("Invalid position", pos);
+ throw new BadLocationException(Messages.getString("swing.98"), pos); //$NON-NLS-1$
}
getDocument().getText(start, pos - start, paintParams.buffer);
Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/Segment.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/Segment.java?view=diff&rev=513311&r1=513310&r2=513311
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/Segment.java (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/Segment.java Thu Mar 1 05:24:01 2007
@@ -18,6 +18,8 @@
import java.text.CharacterIterator;
+import org.apache.harmony.x.swing.internal.nls.Messages;
+
public class Segment implements Cloneable, CharacterIterator {
public char[] array;
@@ -121,7 +123,7 @@
public char setIndex(final int position) {
if (position < 0 || position > offset + count) {
- throw new IllegalArgumentException("invalid position: " + position);
+ throw new IllegalArgumentException(Messages.getString("swing.89", position)); //$NON-NLS-1$
}
pos = position;
Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/StringContent.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/StringContent.java?view=diff&rev=513311&r1=513310&r2=513311
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/StringContent.java (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/StringContent.java Thu Mar 1 05:24:01 2007
@@ -29,11 +29,12 @@
import javax.swing.text.AbstractDocument.Content;
import javax.swing.undo.UndoableEdit;
+import org.apache.harmony.x.swing.internal.nls.Messages;
+
public final class StringContent
implements Content, Serializable {
- private static final String INVALID_START_POSITION_MESSAGE =
- "Invalid start position";
+ private static final String INVALID_START_POSITION_MESSAGE = Messages.getString("swing.0F"); //$NON-NLS-1$
private final class StringContentEdit
extends AbstractContentUndoableEdit implements UndoableEdit {
@@ -160,8 +161,7 @@
private void checkInvalidOnRemove(final int where, final int nitems)
throws BadLocationException {
if (nitems < 0) {
- throw new BadLocationException("The number of characters to remove "
- + "must be non-negative",
+ throw new BadLocationException(Messages.getString("swing.99"), //$NON-NLS-1$
length);
}
@@ -174,7 +174,7 @@
private void checkInvalidOnGetChars(final int where, final int len)
throws BadLocationException {
if (len < 0) {
- throw new BadLocationException("Length must be non-negative",
+ throw new BadLocationException(Messages.getString("swing.8C"), //$NON-NLS-1$
length);
}
@@ -271,4 +271,4 @@
private void writeObject(final ObjectOutputStream oos) throws IOException {
oos.defaultWriteObject();
}
-}
\ No newline at end of file
+}
Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/StyleContext.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/StyleContext.java?view=diff&rev=513311&r1=513310&r2=513311
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/StyleContext.java (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/StyleContext.java Thu Mar 1 05:24:01 2007
@@ -44,6 +44,8 @@
import javax.swing.event.ChangeListener;
import javax.swing.event.EventListenerList;
+import org.apache.harmony.x.swing.internal.nls.Messages;
+
public class StyleContext
implements Serializable, AbstractDocument.AttributeContext {
@@ -300,9 +302,7 @@
public Object nextElement() {
if (count >= attributes.length) {
- new NoSuchElementException("The enumeration has "
- + "no more elements "
- + "to provide");
+ new NoSuchElementException(Messages.getString("swing.9A")); //$NON-NLS-1$
}
Object next = attributes[count++];
@@ -729,7 +729,7 @@
if (key instanceof Integer) {
count = ((Integer)key).intValue();
} else {
- throw new IOException("No attribute set count field.");
+ throw new IOException(Messages.getString("swing.9B")); //$NON-NLS-1$
}
while (count-- > 0) {
@@ -883,4 +883,5 @@
}
}
+
Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/StyledEditorKit.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/StyledEditorKit.java?view=diff&rev=513311&r1=513310&r2=513311
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/StyledEditorKit.java (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/StyledEditorKit.java Thu Mar 1 05:24:01 2007
@@ -26,6 +26,8 @@
import org.apache.harmony.awt.text.TextUtils;
+import org.apache.harmony.x.swing.internal.nls.Messages;
+
/**
* <p>
* <i>StyledEditorKit</i>
@@ -294,7 +296,7 @@
static final class ViewFactoryImpl implements ViewFactory {
public View create(final Element element) {
// if (true) {
-// throw new UnsupportedOperationException("Not implemented");
+// throw new UnsupportedOperationException(Messages.getString("swing.27")); //$NON-NLS-1$
// }
// return null;
//This code committed-out temporarily (while these views is not
@@ -492,4 +494,5 @@
}
}
}
+
Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/TabSet.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/TabSet.java?view=diff&rev=513311&r1=513310&r2=513311
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/TabSet.java (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/TabSet.java Thu Mar 1 05:24:01 2007
@@ -24,6 +24,8 @@
import org.apache.harmony.misc.HashCode;
+import org.apache.harmony.x.swing.internal.nls.Messages;
+
public class TabSet implements Serializable {
@@ -52,7 +54,7 @@
public TabStop getTab(final int i) {
if (i < 0 || i >= tabs.length) {
- throw new IllegalArgumentException("Invalid tab index " + i);
+ throw new IllegalArgumentException(Messages.getString("swing.9C", i)); //$NON-NLS-1$
}
return tabs[i];
}
@@ -111,4 +113,5 @@
return result.toString();
}
}
+
Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/WrappedPlainView.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/WrappedPlainView.java?view=diff&rev=513311&r1=513310&r2=513311
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/WrappedPlainView.java (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/WrappedPlainView.java Thu Mar 1 05:24:01 2007
@@ -32,6 +32,8 @@
import org.apache.harmony.awt.text.TextKit;
import org.apache.harmony.awt.text.TextUtils;
+import org.apache.harmony.x.swing.internal.nls.Messages;
+
public class WrappedPlainView extends BoxView implements TabExpander {
private class LineView extends View {
@@ -72,7 +74,7 @@
int end = getEndOffset() - 1;
if (pos < start || pos > end) {
- throw new BadLocationException("Invalid position", pos);
+ throw new BadLocationException(Messages.getString("swing.98"), pos); //$NON-NLS-1$
}
int lineNo = 0;
Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/CSS.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/CSS.java?view=diff&rev=513311&r1=513310&r2=513311
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/CSS.java (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/CSS.java Thu Mar 1 05:24:01 2007
@@ -42,6 +42,7 @@
import javax.swing.text.View;
import org.apache.harmony.x.swing.Utilities;
+import org.apache.harmony.x.swing.internal.nls.Messages;
public class CSS implements Serializable {
public static final class Attribute {
@@ -1689,8 +1690,7 @@
return new Integer(fontSize * 120 / 100);
default:
- System.err.println("font-size: can't resolve relative value. "
- + "Unknown relative unit");
+ System.err.println(Messages.getString("swing.err.07")); //$NON-NLS-1$
}
return getDefaultValue();
}
@@ -2163,8 +2163,7 @@
return new Float(width * theValue.floatValue() / 100);
default:
- System.err.println("FloatValue: can't resolve relative value. "
- + "Unknown relative unit");
+ System.err.println(Messages.getString("swing.err.07")); //$NON-NLS-1$
}
return ZERO;
}
Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/CascadedStyle.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/CascadedStyle.java?view=diff&rev=513311&r1=513310&r2=513311
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/CascadedStyle.java (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/CascadedStyle.java Thu Mar 1 05:24:01 2007
@@ -33,6 +33,8 @@
import javax.swing.text.Style;
import javax.swing.text.StyleConstants;
+import org.apache.harmony.x.swing.internal.nls.Messages;
+
/**
* Storage for all the attributes applicable for the
* {@link javax.swing.text.Element} for which CascadedStyle
@@ -124,27 +126,27 @@
}
public void removeAttribute(final Object arg0) {
-// throw new UnsupportedOperationException("Not implemented yet");
+// throw new UnsupportedOperationException(Messages.getString("swing.27")); //$NON-NLS-1$
}
public void removeAttributes(final Enumeration arg0) {
-// throw new UnsupportedOperationException("Not implemented yet");
+// throw new UnsupportedOperationException(Messages.getString("swing.27")); //$NON-NLS-1$
}
public void addAttributes(final AttributeSet arg0) {
-// throw new UnsupportedOperationException("Not implemented yet");
+// throw new UnsupportedOperationException(Messages.getString("swing.27")); //$NON-NLS-1$
}
public void removeAttributes(final AttributeSet arg0) {
-// throw new UnsupportedOperationException("Not implemented yet");
+// throw new UnsupportedOperationException(Messages.getString("swing.27")); //$NON-NLS-1$
}
public void setResolveParent(final AttributeSet arg0) {
-// throw new UnsupportedOperationException("Not implemented yet");
+// throw new UnsupportedOperationException(Messages.getString("swing.27")); //$NON-NLS-1$
}
public void addAttribute(final Object arg0, final Object arg1) {
-// throw new UnsupportedOperationException("Not implemented yet");
+// throw new UnsupportedOperationException(Messages.getString("swing.27")); //$NON-NLS-1$
}
public int getAttributeCount() {
@@ -223,7 +225,7 @@
}
public AttributeSet copyAttributes() {
- throw new UnsupportedOperationException("Not implemented yet");
+ throw new UnsupportedOperationException(Messages.getString("swing.27")); //$NON-NLS-1$
}
public AttributeSet getResolveParent() {
Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/FormView.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/FormView.java?view=diff&rev=513311&r1=513310&r2=513311
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/FormView.java (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/FormView.java Thu Mar 1 05:24:01 2007
@@ -49,12 +49,14 @@
import org.apache.harmony.x.swing.text.html.form.FormToggleButtonModel;
import org.apache.harmony.x.swing.internal.nls.Messages;
+import org.apache.harmony.x.swing.internal.nls.Messages;
+
public class FormView extends ComponentView implements ActionListener {
private static final int EMPTY_SPAN = 0;
protected class MouseEventListener extends MouseAdapter {
public void mouseReleased(final MouseEvent evt) {
- throw new UnsupportedOperationException("Not implemented");
+ throw new UnsupportedOperationException(Messages.getString("swing.27")); //$NON-NLS-1$
}
}
@@ -76,7 +78,7 @@
public float getMaximumSpan(final int axis) {
if (axis != View.X_AXIS && axis != View.Y_AXIS) {
- throw new IllegalArgumentException(Messages.getString("swing.00", axis)); //$NON-NLS-1$
+ throw new IllegalArgumentException(Messages.getString("swing.00", axis)); //$NON-NLS-1$
}
if (getComponent() == null || getParent() == null) {
return EMPTY_SPAN;
@@ -253,12 +255,12 @@
protected void imageSubmit(final String imageData) {
// TODO implement imageSubmit
- throw new UnsupportedOperationException("Not implemented");
+ throw new UnsupportedOperationException(Messages.getString("swing.27")); //$NON-NLS-1$
}
protected void submitData(final String data) {
// TODO implement submitData
- throw new UnsupportedOperationException("Not implemented");
+ throw new UnsupportedOperationException(Messages.getString("swing.27")); //$NON-NLS-1$
}
private void determineValidControls(final Form form) {
@@ -280,7 +282,7 @@
case FormAttributes.TEXTAREA_TYPE_INDEX :
case FormAttributes.SELECT_LIST_TYPE_INDEX :
case FormAttributes.SELECT_COMBOBOX_TYPE_INDEX :
- throw new UnsupportedOperationException("Not implemented");
+ throw new UnsupportedOperationException(Messages.getString("swing.27")); //$NON-NLS-1$
default :
// Do nothing
break;
@@ -355,4 +357,4 @@
//CHECKED
model.setSelected(attrs.getAttribute(HTML.Attribute.CHECKED) != null);
}
-}
\ No newline at end of file
+}
Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/HTMLDocument.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/HTMLDocument.java?view=diff&rev=513311&r1=513310&r2=513311
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/HTMLDocument.java (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/HTMLDocument.java Thu Mar 1 05:24:01 2007
@@ -59,6 +59,8 @@
import org.apache.harmony.x.swing.text.html.form.FormTextModel;
import org.apache.harmony.x.swing.text.html.form.FormToggleButtonModel;
+import org.apache.harmony.x.swing.internal.nls.Messages;
+
public class HTMLDocument extends DefaultStyledDocument {
public class BlockElement extends BranchElement {
@@ -1226,7 +1228,7 @@
int numRemovingElements = elem.getElementCount();
insertHTMLText(elem, elem.getStartOffset(), htmlText);
removeElements(elem, elem.getElementCount() - numRemovingElements, numRemovingElements);
- throw new UnsupportedOperationException("Not implemented");
+ throw new UnsupportedOperationException(Messages.getString("swing.27")); //$NON-NLS-1$
}
public void setOuterHTML(final Element elem, final String htmlText)
@@ -1242,7 +1244,7 @@
final int numElementsBefore = parent.getElementCount();
insertHTMLText(elem.getParentElement(), elem.getStartOffset(), htmlText);
removeElements(parent, indexBefore + (parent.getElementCount() - numElementsBefore), 1);
- throw new UnsupportedOperationException("Not implemented");
+ throw new UnsupportedOperationException(Messages.getString("swing.27")); //$NON-NLS-1$
}
public void processHTMLFrameHyperlinkEvent(final HTMLFrameHyperlinkEvent event) {
@@ -1383,13 +1385,13 @@
private void checkParser() {
if (parser == null) {
- throw new IllegalStateException("Parser should be set");
+ throw new IllegalStateException(Messages.getString("swing.9D")); //$NON-NLS-1$
}
}
private void checkLeaf(final Element elem) {
if (elem.isLeaf()) {
- throw new IllegalArgumentException("Can't insert HTML text after start of a leaf element");
+ throw new IllegalArgumentException(Messages.getString("swing.9E")); //$NON-NLS-1$
}
}
Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/HTMLEditorKit.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/HTMLEditorKit.java?view=diff&rev=513311&r1=513310&r2=513311
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/HTMLEditorKit.java (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/HTMLEditorKit.java Thu Mar 1 05:24:01 2007
@@ -67,6 +67,8 @@
import org.apache.harmony.awt.text.TextUtils;
import org.apache.harmony.x.swing.StringConstants;
+import org.apache.harmony.x.swing.internal.nls.Messages;
+
public class HTMLEditorKit extends StyledEditorKit implements Accessible {
public static class HTMLFactory implements ViewFactory {
@@ -146,7 +148,7 @@
// TODO: uncomment the next line and remove throw
// when all tags are supported
// return new LabelView(elem);
- throw new UnsupportedOperationException("Not implemented tag: " + tag);
+ throw new UnsupportedOperationException(Messages.getString("swing.9F") + tag); //$NON-NLS-1$
}
}
@@ -201,7 +203,7 @@
if (doc instanceof HTMLDocument) {
return (HTMLDocument)doc;
}
- throw new IllegalArgumentException("Document must be HTMLDocument");
+ throw new IllegalArgumentException(Messages.getString("swing.A0")); //$NON-NLS-1$
}
protected HTMLEditorKit getHTMLEditorKit(final JEditorPane pane) {
@@ -209,7 +211,7 @@
if (editorKit instanceof HTMLEditorKit) {
return (HTMLEditorKit)editorKit;
}
- throw new IllegalArgumentException("Editor kit must be HTMLEditorKit");
+ throw new IllegalArgumentException(Messages.getString("swing.A1")); //$NON-NLS-1$
}
}
@@ -569,7 +571,7 @@
final Bias[] biasRet) throws BadLocationException {
if (direction != NORTH && direction != SOUTH
&& direction != EAST && direction != WEST) {
- throw new IllegalArgumentException("Invalid direction");
+ throw new IllegalArgumentException(Messages.getString("swing.84")); //$NON-NLS-1$
}
biasRet[0] = Position.Bias.Forward;
return getEndOffset();
@@ -621,7 +623,7 @@
public AccessibleContext getAccessibleContext() {
// TODO: implement
- throw new UnsupportedOperationException("Not implemented");
+ throw new UnsupportedOperationException(Messages.getString("swing.9F")); //$NON-NLS-1$
}
public Action[] getActions() {
@@ -706,7 +708,7 @@
final int pushDepth, final HTML.Tag insertTag)
throws BadLocationException, IOException {
if (offset > doc.getLength()) {
- throw new BadLocationException("Invalid position", offset);
+ throw new BadLocationException(Messages.getString("swing.98"), offset); //$NON-NLS-1$
}
ParserCallback htmlReader = doc.getReader(offset, popDepth,
@@ -783,17 +785,17 @@
private static void checkReadPosition(final HTMLDocument doc, final int pos)
throws BadLocationException {
if (pos < 0) {
- throw new RuntimeException("Position cannot be negative");
+ throw new RuntimeException(Messages.getString("swing.A2")); //$NON-NLS-1$
}
if (pos > doc.getLength()) {
- throw new BadLocationException("Invalid position", pos);
+ throw new BadLocationException(Messages.getString("swing.98"), pos); //$NON-NLS-1$
}
if (doc.getLength() != 0) {
Element body = doc.getElement(doc.getDefaultRootElement(),
StyleConstants.NameAttribute,
HTML.Tag.BODY);
if (pos < body.getStartOffset() || pos > body.getEndOffset()) {
- throw new RuntimeException("Must insert inside body element");
+ throw new RuntimeException(Messages.getString("swing.A3")); //$NON-NLS-1$
}
}
}
Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/MinimalHTMLWriter.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/MinimalHTMLWriter.java?view=diff&rev=513311&r1=513310&r2=513311
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/MinimalHTMLWriter.java (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/MinimalHTMLWriter.java Thu Mar 1 05:24:01 2007
@@ -39,6 +39,8 @@
import javax.swing.text.StyleContext;
import javax.swing.text.StyledDocument;
+import org.apache.harmony.x.swing.internal.nls.Messages;
+
public class MinimalHTMLWriter extends AbstractWriter {
private static final AttributeSet EMPTY_ATTR_SET = new SimpleAttributeSet();
private Vector openEmbeddedTags = new Vector();
@@ -222,7 +224,7 @@
protected void writeStyles() throws IOException {
if (!(getDocument() instanceof DefaultStyledDocument)) {
// XXX: it's not clear what to do in this case
- throw new UnsupportedOperationException("Not implemented");
+ throw new UnsupportedOperationException(Messages.getString("swing.9F")); //$NON-NLS-1$
}
StyledDocument styledDocument = (StyledDocument)getDocument();
Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/ObjectView.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/ObjectView.java?view=diff&rev=513311&r1=513310&r2=513311
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/ObjectView.java (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/ObjectView.java Thu Mar 1 05:24:01 2007
@@ -24,14 +24,17 @@
import javax.swing.text.ComponentView;
import javax.swing.text.Element;
+import org.apache.harmony.x.swing.internal.nls.Messages;
+
public class ObjectView extends ComponentView {
public ObjectView(final Element elem) {
super(elem);
- throw new UnsupportedOperationException("Not implemented");
+ throw new UnsupportedOperationException(Messages.getString("swing.9F")); //$NON-NLS-1$
}
protected Component createComponent() {
- throw new UnsupportedOperationException("Not implemented");
+ throw new UnsupportedOperationException(Messages.getString("swing.9F")); //$NON-NLS-1$
}
}
+
Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/StyleSheet.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/StyleSheet.java?view=diff&rev=513311&r1=513310&r2=513311
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/StyleSheet.java (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/StyleSheet.java Thu Mar 1 05:24:01 2007
@@ -71,6 +71,8 @@
import org.apache.harmony.x.swing.text.html.cssparser.metamodel.RuleSet;
import org.apache.harmony.x.swing.text.html.cssparser.metamodel.Sheet;
+import org.apache.harmony.x.swing.internal.nls.Messages;
+
/**
* Implementation of this class is based on <a href="http://www.w3.org/TR/CSS1">CSS1</a>.
*/
@@ -132,7 +134,7 @@
updateProperties();
if (!(g instanceof Graphics2D)) {
- System.err.println("Graphics is not instance of Graphics2D");
+ System.err.println(Messages.getString("swing.err.09")); //$NON-NLS-1$
}
Graphics2D g2d = (Graphics2D)g;
@@ -307,7 +309,7 @@
return CSS.LEFT_SIDE;
default:
- throw new IllegalArgumentException("Invalid side " + side);
+ throw new IllegalArgumentException(Messages.getString("swing.A4", side)); //$NON-NLS-1$
}
}
@@ -1148,7 +1150,7 @@
}
private void parseSheet(final boolean asResolver) {
-// throw new UnsupportedOperationException("CSS parser required!");
+// throw new UnsupportedOperationException(Messages.getString("swing.A5")); //$NON-NLS-1$
Sheet ss = null;
try {
ss = parser.parse();
Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/parser/Parser.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/parser/Parser.java?view=diff&rev=513311&r1=513310&r2=513311
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/parser/Parser.java (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/parser/Parser.java Thu Mar 1 05:24:01 2007
@@ -30,6 +30,8 @@
import javax.swing.text.html.HTML.Tag;
import javax.swing.tree.DefaultMutableTreeNode;
+import org.apache.harmony.x.swing.internal.nls.Messages;
+
/**
* This class attempts to read and parse an HTML file, which it gets via an
* Input Stream. The parsing is based on a Documet Type Definition
@@ -123,7 +125,7 @@
* @param omitted determines whether the end tag may be omitted or not.
*/
protected void endTag(final boolean omitted) {
- throw new UnsupportedOperationException("not implemented");
+ throw new UnsupportedOperationException(Messages.getString("swing.27")); //$NON-NLS-1$
// XXX: Perhaps depending on the boolean value, an endtag.missing
// error may be thrown
//handleEndTag(currentTag);
@@ -302,7 +304,7 @@
*
*/
protected void handleEOFInComment() {
- throw new UnsupportedOperationException("Not implemented");
+ throw new UnsupportedOperationException(Messages.getString("swing.9F")); //$NON-NLS-1$
}
/**
@@ -375,7 +377,7 @@
*/
protected void markFirstTime(final Element elem) {
// TODO review this
- throw new UnsupportedOperationException("Not implemented");
+ throw new UnsupportedOperationException(Messages.getString("swing.9F")); //$NON-NLS-1$
}
/**
@@ -1428,4 +1430,4 @@
}
}
}
-}
\ No newline at end of file
+}
Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/parser/ParserCup.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/parser/ParserCup.java?view=diff&rev=513311&r1=513310&r2=513311
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/parser/ParserCup.java (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/parser/ParserCup.java Thu Mar 1 05:24:01 2007
@@ -28,6 +28,8 @@
import java.util.List;
import java.math.BigInteger;
+import org.apache.harmony.x.swing.internal.nls.Messages;
+
/** CUP v0.11a beta 20060102 generated parser.
* @version Wed Dec 20 21:02:26 ART 2006
*/
@@ -1144,10 +1146,10 @@
/* . . . . . .*/
default:
- throw new Exception(
- "Invalid action number found in internal parse table");
+ throw new Exception(Messages.getString("swing.04")); //$NON-NLS-1$
}
}
}
+
Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/tree/DefaultMutableTreeNode.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/tree/DefaultMutableTreeNode.java?view=diff&rev=513311&r1=513310&r2=513311
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/tree/DefaultMutableTreeNode.java (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/tree/DefaultMutableTreeNode.java Thu Mar 1 05:24:01 2007
@@ -28,6 +28,8 @@
import java.util.NoSuchElementException;
import java.util.Vector;
+import org.apache.harmony.x.swing.internal.nls.Messages;
+
public class DefaultMutableTreeNode implements Cloneable, MutableTreeNode, Serializable {
public static final Enumeration<TreeNode> EMPTY_ENUMERATION = new Vector<TreeNode>().elements();
@@ -51,10 +53,10 @@
public void insert(final MutableTreeNode child, final int childIndex) {
if (!getAllowsChildren()) {
- throw new IllegalStateException("Children are not allowed for this node");
+ throw new IllegalStateException(Messages.getString("swing.A6")); //$NON-NLS-1$
}
if (child == null || isNodeAncestor(child)) {
- throw new IllegalArgumentException("specified child node is null or an ancestor of the current node");
+ throw new IllegalArgumentException(Messages.getString("swing.A7")); //$NON-NLS-1$
}
if (child.getParent() instanceof MutableTreeNode) {
@@ -87,7 +89,7 @@
public int getIndex(final TreeNode child) {
if (child == null) {
- throw new IllegalArgumentException("child must be not null");
+ throw new IllegalArgumentException(Messages.getString("swing.A8")); //$NON-NLS-1$
}
return children != null ? children.indexOf(child) : -1;
@@ -125,7 +127,7 @@
public void remove(final MutableTreeNode child) {
int index = -1;
if (child == null || children == null || (index = children.indexOf(child)) == -1) {
- throw new IllegalArgumentException("specified child is null or is not a child of this node");
+ throw new IllegalArgumentException(Messages.getString("swing.A9")); //$NON-NLS-1$
}
remove(index);
}
@@ -288,7 +290,7 @@
if (children == null || !children.hasMoreElements()) {
if (nextLevelChildren.isEmpty()) {
- throw new NoSuchElementException("no more elements in enumeration");
+ throw new NoSuchElementException(Messages.getString("swing.AA")); //$NON-NLS-1$
} else {
children = (Enumeration)nextLevelChildren.remove(0);
}
@@ -314,7 +316,7 @@
public Enumeration pathFromAncestorEnumeration(final TreeNode ancestor) {
if (!isNodeAncestor(ancestor)) {
- throw new IllegalArgumentException("Specified ancestor is not an ancestor of this node");
+ throw new IllegalArgumentException(Messages.getString("swing.AB")); //$NON-NLS-1$
}
return new Enumeration() {
@@ -327,7 +329,7 @@
}
if (previousAncestor == DefaultMutableTreeNode.this) {
- throw new NoSuchElementException("no more elements in enumeration");
+ throw new NoSuchElementException(Messages.getString("swing.AA")); //$NON-NLS-1$
}
TreeNode nextNode = DefaultMutableTreeNode.this;
while (nextNode.getParent() != previousAncestor) {
@@ -350,7 +352,7 @@
public TreeNode getFirstChild() {
if (children == null || children.isEmpty()) {
- throw new NoSuchElementException("Node has no children");
+ throw new NoSuchElementException(Messages.getString("swing.AC")); //$NON-NLS-1$
}
return (TreeNode)children.get(0);
@@ -358,7 +360,7 @@
public TreeNode getLastChild() {
if (children == null || children.isEmpty()) {
- throw new NoSuchElementException("Node has no children");
+ throw new NoSuchElementException(Messages.getString("swing.AC")); //$NON-NLS-1$
}
return (TreeNode)children.get(children.size() - 1);
@@ -367,7 +369,7 @@
public TreeNode getChildAfter(final TreeNode child) {
int index = -1;
if (child == null || (index = getIndex(child)) == -1) {
- throw new IllegalArgumentException("Specified child is not a child of this node");
+ throw new IllegalArgumentException(Messages.getString("swing.AD")); //$NON-NLS-1$
}
return index + 1 < getChildCount() ? getChildAt(index + 1) : null;
@@ -376,7 +378,7 @@
public TreeNode getChildBefore(final TreeNode child) {
int index = -1;
if (child == null || (index = getIndex(child)) == -1) {
- throw new IllegalArgumentException("Specified child is not a child of this node");
+ throw new IllegalArgumentException(Messages.getString("swing.AD")); //$NON-NLS-1$
}
return index > 0 ? getChildAt(index - 1) : null;
@@ -548,7 +550,7 @@
return subChildren.nextElement();
}
- throw new NoSuchElementException("no more elements in enumeration");
+ throw new NoSuchElementException(Messages.getString("swing.AA")); //$NON-NLS-1$
}
public boolean hasMoreElements() {
@@ -575,7 +577,7 @@
children = null;
return root;
} else {
- throw new NoSuchElementException("no more elements in enumeration");
+ throw new NoSuchElementException(Messages.getString("swing.AA")); //$NON-NLS-1$
}
}
Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/tree/DefaultTreeModel.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/tree/DefaultTreeModel.java?view=diff&rev=513311&r1=513310&r2=513311
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/tree/DefaultTreeModel.java (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/tree/DefaultTreeModel.java Thu Mar 1 05:24:01 2007
@@ -30,6 +30,8 @@
import org.apache.harmony.x.swing.TreeCommons;
import org.apache.harmony.x.swing.Utilities;
+import org.apache.harmony.x.swing.internal.nls.Messages;
+
public class DefaultTreeModel implements TreeModel, Serializable {
@@ -132,7 +134,7 @@
final int index) {
if (newChild == null) {
- throw new IllegalArgumentException("new child is null");
+ throw new IllegalArgumentException(Messages.getString("swing.03","new child")); //$NON-NLS-1$ //$NON-NLS-2$
}
parent.insert(newChild, index);
nodesWereInserted(parent, new int[] {index});
@@ -141,7 +143,7 @@
public void removeNodeFromParent(final MutableTreeNode node) {
MutableTreeNode parent = (MutableTreeNode)node.getParent();
if (parent == null) {
- throw new IllegalArgumentException("node doesn't have a parent");
+ throw new IllegalArgumentException(Messages.getString("swing.AF")); //$NON-NLS-1$
}
int index = parent.getIndex(node);
parent.remove(node);
Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/tree/DefaultTreeSelectionModel.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/tree/DefaultTreeSelectionModel.java?view=diff&rev=513311&r1=513310&r2=513311
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/tree/DefaultTreeSelectionModel.java (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/tree/DefaultTreeSelectionModel.java Thu Mar 1 05:24:01 2007
@@ -35,6 +35,8 @@
import org.apache.harmony.x.swing.Utilities;
+import org.apache.harmony.x.swing.internal.nls.Messages;
+
public class DefaultTreeSelectionModel implements Cloneable, Serializable, TreeSelectionModel {
@@ -397,7 +399,7 @@
selection = getUniquePathArray(combined);
break;
default:
- throw new IllegalArgumentException("modification mode is incorrect");
+ throw new IllegalArgumentException(Messages.getString("swing.B0")); //$NON-NLS-1$
}
}
Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/tree/FixedHeightLayoutCache.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/tree/FixedHeightLayoutCache.java?view=diff&rev=513311&r1=513310&r2=513311
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/tree/FixedHeightLayoutCache.java (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/tree/FixedHeightLayoutCache.java Thu Mar 1 05:24:01 2007
@@ -25,6 +25,8 @@
import javax.swing.event.TreeModelEvent;
+import org.apache.harmony.x.swing.internal.nls.Messages;
+
public class FixedHeightLayoutCache extends AbstractLayoutCache {
public FixedHeightLayoutCache() {
setRowHeight(1);
@@ -32,7 +34,7 @@
public void setRowHeight(final int rowHeight) {
if (rowHeight <= 0) {
- throw new IllegalArgumentException("row height must be positive value");
+ throw new IllegalArgumentException(Messages.getString("swing.97")); //$NON-NLS-1$
}
super.setRowHeight(rowHeight);
}
Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/tree/TreePath.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/tree/TreePath.java?view=diff&rev=513311&r1=513310&r2=513311
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/tree/TreePath.java (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/tree/TreePath.java Thu Mar 1 05:24:01 2007
@@ -24,6 +24,8 @@
import org.apache.harmony.x.swing.Utilities;
+import org.apache.harmony.x.swing.internal.nls.Messages;
+
public class TreePath implements Serializable {
@@ -33,7 +35,7 @@
public TreePath(final Object[] path) {
if (Utilities.isEmptyArray(path)) {
- throw new IllegalArgumentException("path in TreePath must be not null and not empty");
+ throw new IllegalArgumentException(Messages.getString("swing.82")); //$NON-NLS-1$
}
pathCount = path.length;
@@ -44,7 +46,7 @@
public TreePath(final Object singlePath) {
if (singlePath == null) {
- throw new IllegalArgumentException("path in TreePath must not be null");
+ throw new IllegalArgumentException(Messages.getString("swing.76")); //$NON-NLS-1$
}
elements = new Object[] {singlePath};
pathCount = 1;
@@ -66,7 +68,7 @@
protected TreePath(final TreePath parentPath, final Object lastElement) {
if (lastElement == null) {
- throw new IllegalArgumentException("path in TreePath must not be null.");
+ throw new IllegalArgumentException(Messages.getString("swing.76")); //$NON-NLS-1$
}
elements = new Object[] {lastElement};
@@ -129,7 +131,7 @@
public Object getPathComponent(final int element) {
final int pathCount = getPathCount();
if (element < 0 || element >= pathCount) {
- throw new IllegalArgumentException("Index " + element + " is out of the specified range");
+ throw new IllegalArgumentException(Messages.getString("swing.75", element)); //$NON-NLS-1$
}
if (parent == null) {
return elements[element];
@@ -164,7 +166,7 @@
public TreePath pathByAddingChild(final Object child) {
if (child == null) {
- throw new NullPointerException("Null child not allowed");
+ throw new NullPointerException(Messages.getString("swing.72")); //$NON-NLS-1$
}
return new TreePath(this, child);
@@ -188,4 +190,4 @@
return "[" + result + "]";
}
-}
\ No newline at end of file
+}
Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/org/apache/harmony/x/swing/BlitSupport.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/org/apache/harmony/x/swing/BlitSupport.java?view=diff&rev=513311&r1=513310&r2=513311
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/org/apache/harmony/x/swing/BlitSupport.java (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/org/apache/harmony/x/swing/BlitSupport.java Thu Mar 1 05:24:01 2007
@@ -34,6 +34,8 @@
import org.apache.harmony.awt.ComponentInternals;
import org.apache.harmony.awt.gl.MultiRectArea;
+import org.apache.harmony.x.swing.internal.nls.Messages;
+
/**
* Blit engine which allows to 'repaint' moving components using Graphics.copyArea() (blitting mode).
@@ -170,7 +172,7 @@
private boolean initialize() {
if (blitingComponent == null) {
- throw new IllegalStateException("Component is not defined yet");
+ throw new IllegalStateException(Messages.getString("swing.71")); //$NON-NLS-1$
}
if (parent == null) {
Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/org/apache/harmony/x/swing/Utilities.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/org/apache/harmony/x/swing/Utilities.java?view=diff&rev=513311&r1=513310&r2=513311
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/org/apache/harmony/x/swing/Utilities.java (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/org/apache/harmony/x/swing/Utilities.java Thu Mar 1 05:24:01 2007
@@ -60,6 +60,8 @@
import javax.swing.plaf.basic.BasicGraphicsUtils;
import javax.swing.text.Position;
+import org.apache.harmony.x.swing.internal.nls.Messages;
+
/**
* SwingUtilities extension. This class provides utility
* methods which are widely used in Swing classes.
@@ -98,11 +100,11 @@
public static int getNextMatch(final ListModelAccessor model, final String prefix,
final int startIndex, final Position.Bias bias) {
if (prefix == null) {
- throw new IllegalArgumentException("Prefix must be not null");
+ throw new IllegalArgumentException(Messages.getString("swing.6F")); //$NON-NLS-1$
}
if (startIndex < 0 || startIndex >= model.getSize()) {
- throw new IllegalArgumentException("Incorrect start index");
+ throw new IllegalArgumentException(Messages.getString("swing.6D")); //$NON-NLS-1$
}
String ucPrefix = prefix.toUpperCase();
@@ -1139,4 +1141,4 @@
result += box.y;
return result;
}
-}
\ No newline at end of file
+}
Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/org/apache/harmony/x/swing/internal/nls/messages.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/org/apache/harmony/x/swing/internal/nls/messages.properties?view=diff&rev=513311&r1=513310&r2=513311
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/org/apache/harmony/x/swing/internal/nls/messages.properties (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/org/apache/harmony/x/swing/internal/nls/messages.properties Thu Mar 1 05:24:01 2007
@@ -17,6 +17,187 @@
# messages for EN locale
swing.00=Invalid axis: {0}
swing.01=fromIndex must be <= toIndex
-swing.02=Invalid verticalScrollBarPolicy
-swing.03=Invalid horizontalScrollBarPolicy
-swing.04=ComboBox is null
+swing.02=Invalid '{0}'
+swing.03='{0}' is null
+swing.04=Invalid action number found in internal parse table
+swing.05=threshhold must be >= 0
+swing.06=Ancestor shouldn't be null
+swing.07=Invalid range properties
+swing.08=Incorrect selection mode is specified
+swing.09=Incorrect range for grayscale factor
+swing.0A=Panel to remove can not be found
+swing.0B=Cannot modify immutable data model
+swing.0C=Selected index should in the range of available indices
+swing.0D=For '{0}' condition ComponentInputMap has to be provided
+swing.0E={0} was asked to deinstall() {1} when it only knows about {2}
+swing.0F=Invalid start position
+swing.10=index == {0}
+swing.11=Incorrect dialog type is specified
+swing.12=Incorrect file selection mode is specified
+swing.13=must be one of:
+swing.14=Invalid index is specified
+swing.15=data model must be not null
+swing.16=Model cannot be null
+swing.17=Selection model must be not null
+swing.18=DnD could not be used in headless environment
+swing.19=Incorect layout orientation is specified
+swing.1A=Visible region should be not null
+swing.1B=Incorrect orientation is specified
+swing.1C=Delay must be positive
+swing.1D=Incorrect type of the etched border
+swing.1E='{0}': parentComponent does not have a valid parent
+swing.1F='{0}': type must be one of
+swing.20=Illegal Option Type
+swing.21=index must be positive
+swing.22=index is greater than the number of items
+swing.23={0} is not a valid title justification.
+swing.24={0} is not a valid title position.
+swing.25=Incorrect vertical policy is specified
+swing.26=Incorrect key {0} is invalid
+swing.27=Not implemented
+swing.28=orientation must be one of: VERTICAL, HORIZONTAL
+swing.29=argument must be VERTICAL or HORIZONTAL
+swing.2A=increment must be > 0
+swing.2B=start is out of range
+swing.2C=model not a '{0}'
+swing.2D=Illegal startingRow is specified. Must be in the valid range
+swing.2E={0} is not supported on this platform.
+swing.2F=null model
+swing.30=null editor
+swing.31=Illegal selection interval is specified. Should be in [0, {0}]
+swing.32=Incorrect resize weight is specified
+swing.33=Incorrect proportional location is specified
+swing.34=Component not found in the tabbed pane
+swing.35=index < -1 || index >= tab count
+swing.36=invalid tabLayoutPolicy
+swing.37=invalid tabPlacement
+swing.38=Row height must be positive
+swing.39=Column does not exist
+swing.3A=Model must be not null
+swing.3B=Column model must be not null
+swing.3C=rows: {0}
+swing.3D=columns: {0}
+swing.3E=Negative line
+swing.3F=No such line
+swing.40=Can't translate offset to line
+swing.41=Invalid orientation: {0}
+swing.42=Invalid insert
+swing.43=Invalid remove
+swing.44=end before start
+swing.45=columns less than zero.
+swing.46=rows less than zero.
+swing.47=orientation must be VERTICAL or HORIZONTAL
+swing.48=Model must be StyledDocument.
+swing.49=Kit isn't a StyledEditorKit
+swing.4A={0} is not a legal orientation
+swing.4B=No next element in enumeration
+swing.4C=Prefix must be specified
+swing.4D=ComponentInputMap must have a ComponentInputMap parent associated with the same component
+swing.4E=focusCycleRoot must not be null
+swing.4F=component must not be null
+swing.50=Cannot happen
+swing.51=can't set
+swing.52=Popup content should be specified
+swing.53=Factory should be not null
+swing.54=Container is not a focus cycle root
+swing.55='{0}' must be specified
+swing.56=Component must be in a cycle root of the specified container
+swing.57=ComponentInputMaps must be associated with a non-null JComponent
+swing.58=invalid sequence element
+swing.59=(start <= value <= end) is false
+swing.5A=invalid calendarField
+swing.5B=illegal value
+swing.5C=SpinnerListModel(List) expects non-null non-empty List
+swing.5D=SpinnerListModel(Object[]) expects non-null non-empty Object[]
+swing.5E=value and stepSize must be non-null
+swing.5F=(minimum <= value <= maximum) is false
+swing.60=null stepSize
+swing.61=Cannot convert point from null-component
+swing.62=Cannot convert point to null-component
+swing.63=Invalid initial delay: {0}
+swing.64=Invalid delay: {0}
+swing.65=Incorrect initial delay: {0}
+swing.66=Incorrect dismiss delay: {0}
+swing.67=Incorrect reshow delay: {0}
+swing.68=Color should not be null
+swing.69=path is not found
+swing.6A=index is invalid
+swing.6B=null delegate
+swing.6C=Singleton
+swing.6D=Incorrect start index
+swing.6E=Incorrect direction is specified!
+swing.6F=Prefix must be not null
+swing.70=Incorrect layout orientation
+swing.71=Component is not defined yet
+swing.72=Null child not allowed
+swing.73=illegal argument
+swing.74=constraints must be String
+swing.75=Index {0} is out of the specified range
+swing.76=path in TreePath must not be null
+swing.77=not text component
+swing.78=Column must be not null
+swing.79=Specified index is out of range
+swing.7A=Identifier must be not null
+swing.7B=Identifier is not found
+swing.7C=Model must be not-null
+swing.7D=Null model cannot be used
+swing.7E=Document cannot be modified from listener handler
+swing.7F=Invalid remove position
+swing.80=Invalid remove length
+swing.81=Invalid axis
+swing.82=path in TreePath must be not null and not empty
+swing.83=View representing {0} not found
+swing.84=Invalid direction
+swing.85=Invalid position offset
+swing.86=Error creating instance
+swing.87=Default painter of GlyphView can't paint composed text.
+swing.88=This view doesn't represent offset {0}
+swing.89=Invalid position: {0}
+swing.8A=Empty attribute set
+swing.8B=Not applicable to Layout Pool
+swing.8C=Length must be non-negative
+swing.8D=Invalid start position
+swing.8E=Invalid insert position
+swing.8F=the value is outside the min/max
+swing.90=Wrong parameters : {0}, {1}
+swing.91=bad position: {0}
+swing.92=Cann't parse value
+swing.93=Cann't parse String
+swing.94=stringToValue passed invalid value
+swing.95=incorrect position: {0}
+swing.96=incorrect positions:
+swing.97=row height must be positive value
+swing.98=invalid position:
+swing.99=The number of characters to remove must be non-negative
+swing.9A=The enumeration has no more elements to provide
+swing.9B=No attribute set count field.
+swing.9C=Invalid tab index {0}
+swing.9D=Parser should be set
+swing.9E=Can't insert HTML text after start of a leaf element
+swing.9F=Not implemented tag:
+swing.A0=Document must be HTMLDocument
+swing.A1=Editor kit must be HTMLEditorKit
+swing.A2=Position cannot be negative
+swing.A3=Must insert inside body element
+swing.A4=Invalid side {0}
+swing.A5=CSS parser required!
+swing.A6=Children are not allowed for this node
+swing.A7=specified child node is null or an ancestor of the current node
+swing.A8=child must be not null
+swing.A9=specified child is null or is not a child of this node
+swing.AA=no more elements in enumeration
+swing.AB=Specified ancestor is not an ancestor of this node
+swing.AC=Node has no children
+swing.AD=Specified child is not a child of this node
+swing.AF=node doesn't have a parent
+swing.B0=modification mode is incorrect
+
+swing.err.01=Illegal request
+swing.err.02=BoxLayout should be used for one container only
+swing.err.03=OverlayLayout can't be shared
+swing.err.04=Invalid axis
+swing.err.05=WARNING: HTML/RTF is not supported yet. Plain text will be shown
+swing.err.06=ERROR: UIDefaults.getUI() failed: {0}
+swing.err.07=font-size: can't resolve relative value. Unknown relative unit
+swing.err.08=FloatValue: can't resolve relative value. Unknown relative unit
+swing.err.09=Graphics is not instance of Graphics2D
Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/windows/org/apache/harmony/x/swing/filechooser/windows/WinFileManager.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/windows/org/apache/harmony/x/swing/filechooser/windows/WinFileManager.java?view=diff&rev=513311&r1=513310&r2=513311
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/windows/org/apache/harmony/x/swing/filechooser/windows/WinFileManager.java (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/windows/org/apache/harmony/x/swing/filechooser/windows/WinFileManager.java Thu Mar 1 05:24:01 2007
@@ -36,6 +36,8 @@
import org.apache.harmony.x.swing.filechooser.PlatformFile;
import org.apache.harmony.x.swing.filechooser.PlatformFileManager;
+import org.apache.harmony.x.swing.internal.nls.Messages;
+
public class WinFileManager implements PlatformFileManager {
private static WinFileManager instance;
@@ -55,7 +57,7 @@
public WinFileManager() {
if (instance != null) {
- throw new RuntimeException("Singleton");
+ throw new RuntimeException(Messages.getString("swing.6C")); //$NON-NLS-1$
}
instance = this;
}