Plexus-Mirror/toml4j
1
0
Fork 0
mirror of https://github.com/plexusorg/toml4j.git synced 2025-02-11 11:40:27 +00:00
Code Issues Projects Releases Wiki Activity

Removed ValueWriter#isTable()

Browse source
This commit is contained in:
moandji.ezana 2015-06-29 09:57:05 +02:00
parent 121db7ef05
commit 9968add0ae
8 changed files with 14 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/com/moandjiezana/toml/ArrayValueWriter.java
View file

@ -1,12 +1,12 @@
package com.moandjiezana.toml;
import static com.moandjiezana.toml.ValueWriters.WRITERS;
import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.Collection;
import static com.moandjiezana.toml.ValueWriters.WRITERS;
abstract class ArrayValueWriter implements ValueWriter {
static protected boolean isArrayish(Object value) {
return value instanceof Collection || value.getClass().isArray();
@ -17,11 +17,6 @@ abstract class ArrayValueWriter implements ValueWriter {
return false;
}
@Override
public boolean isTable() {
return false;
}
static boolean isArrayOfPrimitive(Object array) {
Object first = peek(array);
if (first != null) {

5
src/main/java/com/moandjiezana/toml/BooleanConverter.java
View file

@ -39,11 +39,6 @@ class BooleanConverter implements ValueConverter, ValueWriter {
return true;
}
@Override
public boolean isTable() {
return false;
}
private BooleanConverter() {}
@Override

5
src/main/java/com/moandjiezana/toml/DateConverter.java
View file

@ -113,11 +113,6 @@ class DateConverter implements ValueConverter, ValueWriter {
return true;
}
@Override
public boolean isTable() {
return false;
}
private DateConverter() {}
@Override

15
src/main/java/com/moandjiezana/toml/MapValueWriter.java
View file

@ -1,13 +1,13 @@
package com.moandjiezana.toml;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import static com.moandjiezana.toml.PrimitiveArrayValueWriter.PRIMITIVE_ARRAY_VALUE_WRITER;
import static com.moandjiezana.toml.TableArrayValueWriter.TABLE_ARRAY_VALUE_WRITER;
import static com.moandjiezana.toml.ValueWriters.WRITERS;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
class MapValueWriter implements ValueWriter {
static final ValueWriter MAP_VALUE_WRITER = new MapValueWriter();
@ -56,7 +56,7 @@ class MapValueWriter implements ValueWriter {
}
ValueWriter valueWriter = WRITERS.findWriterFor(fromValue);
if (valueWriter.isTable() || valueWriter == TABLE_ARRAY_VALUE_WRITER) {
if (valueWriter == this || valueWriter == ObjectValueWriter.OBJECT_VALUE_WRITER || valueWriter == TABLE_ARRAY_VALUE_WRITER) {
valueWriter.write(fromValue, context.pushTable(quoteKey(key)));
}
}
@ -67,11 +67,6 @@ class MapValueWriter implements ValueWriter {
return false;
}
@Override
public boolean isTable() {
return true;
}
private static String quoteKey(Object key) {
String stringKey = key.toString();
Matcher matcher = requiredQuotingPattern.matcher(stringKey);

5
src/main/java/com/moandjiezana/toml/NumberConverter.java
View file

@ -98,11 +98,6 @@ class NumberConverter implements ValueConverter, ValueWriter {
return true;
}
@Override
public boolean isTable() {
return false;
}
@Override
public String toString() {
return "number";

15
src/main/java/com/moandjiezana/toml/ObjectValueWriter.java
View file

@ -1,10 +1,14 @@
package com.moandjiezana.toml;
import static com.moandjiezana.toml.MapValueWriter.MAP_VALUE_WRITER;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.*;
import static com.moandjiezana.toml.MapValueWriter.MAP_VALUE_WRITER;
import java.util.Arrays;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
class ObjectValueWriter implements ValueWriter {
static final ValueWriter OBJECT_VALUE_WRITER = new ObjectValueWriter();
@ -30,11 +34,6 @@ class ObjectValueWriter implements ValueWriter {
return false;
}
@Override
public boolean isTable() {
return true;
}
static private Set<Field> getFieldsForClass(Class cls) {
Set<Field> fields = new LinkedHashSet<Field>(Arrays.asList(cls.getDeclaredFields()));

5
src/main/java/com/moandjiezana/toml/StringConverter.java
View file

@ -106,11 +106,6 @@ class StringConverter implements ValueConverter, ValueWriter {
return true;
}
@Override
public boolean isTable() {
return false;
}
private void escapeUnicode(String in, StringBuilder out) {
for (int i = 0; i < in.length(); i++) {
int codePoint = in.codePointAt(i);

2
src/main/java/com/moandjiezana/toml/ValueWriter.java
View file

@ -6,6 +6,4 @@ interface ValueWriter {
void write(Object value, WriterContext context);
boolean isPrimitiveType();
boolean isTable();
}