Skip to content

Commit

Permalink
1.6-stable
Browse files Browse the repository at this point in the history
  • Loading branch information
kreon committed Feb 15, 2015
1 parent 29cdcab commit aa9417a
Show file tree
Hide file tree
Showing 76 changed files with 490 additions and 2,428 deletions.
102 changes: 63 additions & 39 deletions jnode-core/src/jnode/core/FileUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,25 @@
public final class FileUtils {
private static final int BLOCK_SIZE = 4096;

/**
* Читает весь файл в строку
* @param path путь к файлу
* @return строка с содержимым файла
* @throws IOException
*/
/**
* Читает весь файл в строку
*
* @param path
* путь к файлу
* @return строка с содержимым файла
* @throws IOException
*/
public static String readFile(String path) throws IOException {
try (FileInputStream stream = new FileInputStream(new File(path))) {
try {
FileInputStream stream = new FileInputStream(new File(path));
FileChannel fc = stream.getChannel();
MappedByteBuffer bb = fc.map(FileChannel.MapMode.READ_ONLY, 0,
fc.size());
return Charset.forName("UTF8").decode(bb).toString();
String s = Charset.forName("UTF8").decode(bb).toString();
stream.close();
return s;
} catch (IOException e) {
throw e;
}
}

Expand Down Expand Up @@ -87,39 +94,56 @@ public static boolean move(File source, File dest, boolean override) {
return false;
}

/**
* zip file
* @param inPath source
* @param outPath destination
* @param nameInsideZip zip entry name
* @throws IOException
*/
public static void zipFile(String inPath, String outPath, String nameInsideZip) throws IOException {
try(FileInputStream in = new FileInputStream(inPath)){
try(ZipOutputStream out = new ZipOutputStream(new FileOutputStream(outPath))){
out.putNextEntry(new ZipEntry(nameInsideZip));
/**
* zip file
*
* @param inPath
* source
* @param outPath
* destination
* @param nameInsideZip
* zip entry name
* @throws IOException
*/
public static void zipFile(String inPath, String outPath,
String nameInsideZip) throws IOException {
try {
FileInputStream in = new FileInputStream(inPath);
try {
ZipOutputStream out = new ZipOutputStream(new FileOutputStream(
outPath));

byte[] buffer = new byte[BLOCK_SIZE];
int len;
out.putNextEntry(new ZipEntry(nameInsideZip));

while ((len = in.read(buffer)) > 0) {
out.write(buffer, 0, len);
}
byte[] buffer = new byte[BLOCK_SIZE];
int len;

out.closeEntry();
}
}
}
while ((len = in.read(buffer)) > 0) {
out.write(buffer, 0, len);
}

/**
* Get path part form full path
* @param fullPath full path
* @return path part
*/
public static String getPathPart(String fullPath){
File temp = new File(fullPath);
String absolutePath = temp.getAbsolutePath();
return absolutePath.
substring(0,absolutePath.lastIndexOf(File.separator));
}
out.closeEntry();
out.close();
} catch (IOException e) {
throw e;
}
in.close();
} catch (IOException e) {
throw e;
}
}

/**
* Get path part form full path
*
* @param fullPath
* full path
* @return path part
*/
public static String getPathPart(String fullPath) {
File temp = new File(fullPath);
String absolutePath = temp.getAbsolutePath();
return absolutePath.substring(0,
absolutePath.lastIndexOf(File.separator));
}
}
84 changes: 34 additions & 50 deletions jnode-core/src/jnode/dao/GenericDAO.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public abstract class GenericDAO<T> {

protected GenericDAO() throws Exception {
if (daoMap == null) {
daoMap = new HashMap<>();
daoMap = new HashMap<Class<?>, Dao<?, ?>>();
}
if (!daoMap.containsKey(getType())) {
Dao<?, ?> dao = DaoManager.createDao(ORMManager.getSource(),
Expand Down Expand Up @@ -98,52 +98,36 @@ private <V> Dao<T, V> getDaoV() {
first = false;
}
String w = args[i + 1].toString();
switch (w) {
case "eq":
case "=":
case "==":

if (w.equalsIgnoreCase("eq") || w.equals("=") || w.equals("==")) {
wh.eq(args[i].toString(), new SelectArg(args[i + 2]));
break;
case "null":
} else if (w.equalsIgnoreCase("null")) {
wh.isNull(args[i].toString());
i -= 1;
break;
case "notnull":
} else if (w.equalsIgnoreCase("notnull")) {
wh.isNotNull(args[i].toString());
i -= 1;
break;
case "ne":
case "!=":
case "<>":
wh.ne(args[i].toString(), new SelectArg(args[i + 2]));
break;
case "gt":
case ">":
wh.gt(args[i].toString(), new SelectArg(args[i + 2]));
break;
case "ge":
case ">=":
wh.ge(args[i].toString(), new SelectArg(args[i + 2]));
break;
case "lt":
case "<":
wh.lt(args[i].toString(), new SelectArg(args[i + 2]));
break;
case "le":
case "<=":
wh.le(args[i].toString(), new SelectArg(args[i + 2]));
break;
case "like":
case "~":
wh.like(args[i].toString(), new SelectArg(args[i + 2]));
break;
case "in":
wh.in(args[i].toString(), (Iterable<?>) args[i + 2]);
break;
case "between":
wh.between(args[i].toString(), new SelectArg(args[i + 2]), new SelectArg(args[i + 3]));
} else if (w.equalsIgnoreCase("ne") || w.equalsIgnoreCase("!=")
|| w.equalsIgnoreCase("<>")) {
wh.ne(args[i].toString(), new SelectArg(args[i + 2]));
} else if (w.equalsIgnoreCase("gt") || w.equalsIgnoreCase(">")) {
wh.gt(args[i].toString(), new SelectArg(args[i + 2]));
} else if (w.equalsIgnoreCase("ge") || w.equalsIgnoreCase(">=")) {

wh.ge(args[i].toString(), new SelectArg(args[i + 2]));
} else if (w.equalsIgnoreCase("lt") || w.equalsIgnoreCase("<")) {

wh.lt(args[i].toString(), new SelectArg(args[i + 2]));
} else if (w.equalsIgnoreCase("le") || w.equalsIgnoreCase("<=")) {
wh.le(args[i].toString(), new SelectArg(args[i + 2]));
} else if (w.equalsIgnoreCase("like") || w.equalsIgnoreCase("~")) {
wh.like(args[i].toString(), new SelectArg(args[i + 2]));
} else if (w.equalsIgnoreCase("in")) {
wh.in(args[i].toString(), (Iterable<?>) args[i + 2]);
} else if (w.equalsIgnoreCase("between")) {
wh.between(args[i].toString(), new SelectArg(args[i + 2]),
new SelectArg(args[i + 3]));
i += 1;
break;
}
}
return wh;
Expand Down Expand Up @@ -177,7 +161,7 @@ public List<T> getAll() {
logger.l1("SQL Exception in getAll", e);
logger.l1(MessageFormat.format("we worked with {0}", e));
}
return new ArrayList<>();
return new ArrayList<T>();
}

/**
Expand All @@ -197,9 +181,9 @@ public List<T> getAnd(Object... args) {
Arrays.toString(args)));

}
return new ArrayList<>();
return new ArrayList<T>();
}

/**
* Аргументы: limit, a == b, c == d
*
Expand All @@ -218,7 +202,7 @@ public List<T> getLimitAnd(long limit, Object... args) {
Arrays.toString(args)));

}
return new ArrayList<>();
return new ArrayList<T>();
}

public List<T> getOrderAnd(String order, boolean asc, Object... args) {
Expand All @@ -232,7 +216,7 @@ public List<T> getOrderAnd(String order, boolean asc, Object... args) {
logger.l1(MessageFormat.format("we worked with {0} {1} {2}", order,
asc, Arrays.toString(args)));
}
return new ArrayList<>();
return new ArrayList<T>();
}

public List<T> getOrderLimitAnd(long limit, String order, boolean asc,
Expand All @@ -248,7 +232,7 @@ public List<T> getOrderLimitAnd(long limit, String order, boolean asc,
logger.l1(MessageFormat.format("we worked with {0} {1} {2} {3}",
limit, order, asc, Arrays.toString(args)));
}
return new ArrayList<>();
return new ArrayList<T>();
}

/**
Expand All @@ -267,7 +251,7 @@ public List<T> getOr(Object... args) {
logger.l1(MessageFormat.format("we worked with {0}",
Arrays.toString(args)));
}
return new ArrayList<>();
return new ArrayList<T>();
}

public List<T> getOrderOr(String order, boolean asc, Object... args) {
Expand All @@ -281,7 +265,7 @@ public List<T> getOrderOr(String order, boolean asc, Object... args) {
logger.l1(MessageFormat.format("we worked with {0} {1} {2}", order,
asc, Arrays.toString(args)));
}
return new ArrayList<>();
return new ArrayList<T>();
}

public T getFirstAnd(Object... args) {
Expand Down Expand Up @@ -426,7 +410,7 @@ public List<T> list() {
} catch (SQLException e) {
logger.l2("SQL error while query", e);
}
return new ArrayList<>();
return new ArrayList<T>();
}

public T one() {
Expand Down
2 changes: 1 addition & 1 deletion jnode-core/src/jnode/dto/LinkOption.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public class LinkOption {
* @return
*/
private static HashMap<String, String> generateOptionsMap() {
HashMap<String, String> options = new HashMap<>();
HashMap<String, String> options = new HashMap<String, String>();
options.put("ignorepktpwd", "-nopwd");
options.put("packnetmail", "-netpack");
options.put("packechomail", "-echpack");
Expand Down
4 changes: 2 additions & 2 deletions jnode-core/src/jnode/event/Notifier.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ public enum Notifier {
private final ConcurrentHashMap<Class<? extends IEvent>, List<IEventHandler>> notifyMap;

private Notifier() {
notifyMap = new ConcurrentHashMap<>();
notifyMap = new ConcurrentHashMap<Class<? extends IEvent>, List<IEventHandler>>();
}

public void register(Class<? extends IEvent> clazz, IEventHandler handler) {
if (clazz != null && handler != null) {
List<IEventHandler> list = notifyMap.get(clazz);
if (list == null) {
list = new ArrayList<>();
list = new ArrayList<IEventHandler>();
}
list.add(handler);
notifyMap.put(clazz, list);
Expand Down
22 changes: 11 additions & 11 deletions jnode-core/src/jnode/ftn/FtnTools.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public final class FtnTools {
"EEE, dd MMM yyyy HH:mm:ss Z", Locale.US);
private static final Logger logger = Logger.getLogger(FtnTools.class);

private static final Hashtable<String, IRobot> robotMaps = new Hashtable<>();
private static final Hashtable<String, IRobot> robotMaps = new Hashtable<String, IRobot>();

/**
* Сортировщик 2D-адресов
Expand Down Expand Up @@ -238,7 +238,7 @@ public static String readUntillNull(InputStream is) {
* @return
*/
public static List<Ftn2D> readSeenBy(String seenByLines) {
List<Ftn2D> seen = new ArrayList<>();
List<Ftn2D> seen = new ArrayList<Ftn2D>();
String[] seenBy = seenByLines.split("[ \n]");
int net = 0;
for (String parts : seenBy) {
Expand Down Expand Up @@ -317,7 +317,7 @@ public static String writeSeenBy(List<Ftn2D> seenby) {
* @return
*/
public static List<Ftn2D> readPath(String seenByLines) {
List<Ftn2D> seen = new ArrayList<>();
List<Ftn2D> seen = new ArrayList<Ftn2D>();
String[] seenBy = seenByLines.split("[ \n]");
int net = 0;
for (String parts : seenBy) {
Expand Down Expand Up @@ -387,7 +387,7 @@ public static String writePath(List<Ftn2D> path) {
* @return
*/
public static List<Ftn2D> read2D(String list2d) {
List<Ftn2D> ret = new ArrayList<>();
List<Ftn2D> ret = new ArrayList<Ftn2D>();

if (list2d == null || list2d.length() == 0
|| list2d.trim().length() == 0) {
Expand Down Expand Up @@ -446,7 +446,7 @@ public static List<Ftn2D> read2D(String list2d) {
* @return
*/
public static List<FtnAddress> read4D(String list2d) {
List<FtnAddress> ret = new ArrayList<>();
List<FtnAddress> ret = new ArrayList<FtnAddress>();
for (String l2d : list2d.split(" ")) {
try {
ret.add(new FtnAddress(l2d));
Expand Down Expand Up @@ -939,7 +939,7 @@ public static Link getLinkByFtnAddress(FtnAddress addr) {
}

public static Link getLinkByFtnAddress(List<FtnAddress> addrs) {
List<String> saddrs = new ArrayList<>();
List<String> saddrs = new ArrayList<String>();
for (FtnAddress a : addrs) {
saddrs.add(a.toString());
}
Expand Down Expand Up @@ -1173,11 +1173,11 @@ protected static List<Message> pack(List<FtnMessage> messages, Link link) {
boolean packEchomail = getOptionBooleanDefTrue(link,
LinkOption.BOOLEAN_PACK_ECHOMAIL);

List<Message> ret = new ArrayList<>();
List<FtnMessage> packedEchomail = new ArrayList<>();
List<FtnMessage> unpackedEchomail = new ArrayList<>();
List<FtnMessage> packedNetmail = new ArrayList<>();
List<FtnMessage> unpackedNetmail = new ArrayList<>();
List<Message> ret = new ArrayList<Message>();
List<FtnMessage> packedEchomail = new ArrayList<FtnMessage>();
List<FtnMessage> unpackedEchomail = new ArrayList<FtnMessage>();
List<FtnMessage> packedNetmail = new ArrayList<FtnMessage>();
List<FtnMessage> unpackedNetmail = new ArrayList<FtnMessage>();
FtnAddress to = new FtnAddress(link.getLinkAddress());
String password = link.getPaketPassword();
FtnPkt header = new FtnPkt(selectOurAka(link), to, password, new Date());
Expand Down
Loading

0 comments on commit aa9417a

Please sign in to comment.