diff --git a/.idea/libraries/jdom_2_0_64.xml b/.idea/libraries/jdom_2_0_6.xml similarity index 100% rename from .idea/libraries/jdom_2_0_64.xml rename to .idea/libraries/jdom_2_0_6.xml diff --git a/.idea/libraries/jdom_2_0_65.xml b/.idea/libraries/jdom_2_0_62.xml similarity index 100% rename from .idea/libraries/jdom_2_0_65.xml rename to .idea/libraries/jdom_2_0_62.xml index 4e83345..f04ca4f 100644 --- a/.idea/libraries/jdom_2_0_65.xml +++ b/.idea/libraries/jdom_2_0_62.xml @@ -2,10 +2,10 @@ - - + + diff --git a/.idea/libraries/lib3.xml b/.idea/libraries/lib.xml similarity index 100% rename from .idea/libraries/lib3.xml rename to .idea/libraries/lib.xml diff --git a/.idea/libraries/xalan2.xml b/.idea/libraries/xalan2.xml index 69e1417..6386da8 100644 --- a/.idea/libraries/xalan2.xml +++ b/.idea/libraries/xalan2.xml @@ -1,8 +1,8 @@ - + diff --git a/.idea/libraries/xalan5.xml b/.idea/libraries/xalan5.xml index 6386da8..69e1417 100644 --- a/.idea/libraries/xalan5.xml +++ b/.idea/libraries/xalan5.xml @@ -1,8 +1,8 @@ - + diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..f199b38 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,793 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1430075632254 + + + 1430124455606 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/console/src/user_interface/ChangeHandler.java b/console/src/user_interface/ChangeHandler.java index 638bd98..7d57f9a 100644 --- a/console/src/user_interface/ChangeHandler.java +++ b/console/src/user_interface/ChangeHandler.java @@ -41,7 +41,7 @@ protected static void countryChanger() { PrintHandler.printArrayCountries(Resources.countries); // Выбор страны для изменения int choice = Integer.parseInt(MainMenu.reader.readLine()); - if (choice < UserData.countryCount) { + if (choice >= 0 && choice < Resources.countries.size()) { changeCountry(choice); } else { throw new IndexOutOfBoundsException(); @@ -50,7 +50,7 @@ protected static void countryChanger() { } catch (IOException e) { MainMenu.out.println(Resources.language.getIO_ERROR()); } catch (IndexOutOfBoundsException e) { - Resources.language.getWRONG_CHOICE(); + MainMenu.out.println(Resources.language.getWRONG_CHOICE()); } } diff --git a/console/src/user_interface/PrintHandler.java b/console/src/user_interface/PrintHandler.java index 05685f2..2e45117 100644 --- a/console/src/user_interface/PrintHandler.java +++ b/console/src/user_interface/PrintHandler.java @@ -202,17 +202,17 @@ private static void printOwnHolidays(){ if (UserData.currentUser != null && !UserData.currentUser.isAdmin()){ if (!UserData.currentUser.getHolidayList().isEmpty()){ ArrayList traditions = new ArrayList(); - for (int i = UserData.traditionCount; i < Resources.traditions.size(); i++){ + for (int i = 0; i < Resources.traditions.size(); i++){ traditions.add(Resources.traditions.get(i)); } UserData.currentUser.setTraditionList(traditions); LinkedList countries = new LinkedList(); - for (int i = UserData.countryCount; i < Resources.countries.size(); i++){ + for (int i = 0; i < Resources.countries.size(); i++){ countries.add(Resources.countries.get(i)); } UserData.currentUser.setCountryList(countries); LinkedList holidays = new LinkedList(); - for (int i = UserData.holidayCount; i < Resources.holidays.size(); i++){ + for (int i = 0; i < Resources.holidays.size(); i++){ holidays.add(Resources.holidays.get(i)); } UserData.currentUser.setHolidayList(holidays); diff --git a/console/src/user_interface/RemoveHandler.java b/console/src/user_interface/RemoveHandler.java index 6890fbb..151aa95 100644 --- a/console/src/user_interface/RemoveHandler.java +++ b/console/src/user_interface/RemoveHandler.java @@ -11,7 +11,7 @@ protected static void holidayRemover() { try { MainMenu.out.println(Resources.language.getID_REQUEST()); int id = Integer.parseInt(MainMenu.reader.readLine()); - if (id >= UserData.holidayCount && id < Resources.holidays.size()) { + if (id >= 0 && id < Resources.holidays.size()) { removeHoliday(id); } else { @@ -31,7 +31,7 @@ protected static void countryRemover() { try { MainMenu.out.println(Resources.language.getID_REQUEST()); int id = Integer.parseInt(MainMenu.reader.readLine()); - if (id >= UserData.countryCount && id < Resources.countries.size()) { + if (id >= 0 && id < Resources.countries.size()) { removeCountry(id); } else { diff --git a/console/src/user_interface/SearchHandler.java b/console/src/user_interface/SearchHandler.java index a02768a..9687300 100644 --- a/console/src/user_interface/SearchHandler.java +++ b/console/src/user_interface/SearchHandler.java @@ -39,7 +39,7 @@ protected static void searchMenu() { } } - private static void searchVoid() { + private static void searchVoid() { //вызов обычного поиски try { MainMenu.out.println(Resources.language.getSEARCH_REQUEST()); String request = MainMenu.reader.readLine(); @@ -53,7 +53,7 @@ private static void searchVoid() { searchMenu(); } - private static void maskSearchVoid() { + private static void maskSearchVoid() { //вызов поиска по маске try { String country, holiday, description = ""; MainMenu.out.println(Resources.language.getCOUNTRY_REQUEST()); @@ -70,7 +70,7 @@ private static void maskSearchVoid() { searchMenu(); } - private static void regularSearchVoid() { + private static void regularSearchVoid() { //вызов поиска по регулярным выражениям try { MainMenu.out.println(Resources.language.getSEARCH_REQUEST()); String request = MainMenu.reader.readLine(); diff --git a/console/src/user_interface/TraditionHandler.java b/console/src/user_interface/TraditionHandler.java index c46cfdc..982946a 100644 --- a/console/src/user_interface/TraditionHandler.java +++ b/console/src/user_interface/TraditionHandler.java @@ -10,7 +10,7 @@ public class TraditionHandler { - public static void traditionMenu() { + public static void traditionMenu() { //меню работы с традициями if (UserData.currentUser != null) { MainMenu.out.println(Resources.language.getTRADITION_MENU()); } @@ -46,7 +46,7 @@ public static void traditionMenu() { } } - private static void printDescription() { + private static void printDescription() { //вывод описания традиции MainMenu.out.println(Resources.language.getID_REQUEST()); try { int id = Integer.parseInt(MainMenu.reader.readLine()); diff --git a/console/src/user_interface/UserHandler.java b/console/src/user_interface/UserHandler.java index a781d5e..e001987 100644 --- a/console/src/user_interface/UserHandler.java +++ b/console/src/user_interface/UserHandler.java @@ -1,7 +1,6 @@ package user_interface; import functional.*; -import model.*; import org.jdom2.JDOMException; import org.xml.sax.SAXException; @@ -9,14 +8,7 @@ import java.io.IOException; import java.io.InputStreamReader; import java.io.PrintWriter; -import java.math.BigInteger; import java.text.ParseException; -import java.util.ArrayList; -import java.util.LinkedList; - -//import modules.functional.DataSaveLoad; -//import modules.functional.SerFileWorking; -//import modules.functional.XmlFileWorking; /** * Created by root on 15.03.15. @@ -25,6 +17,10 @@ public class UserHandler { protected static PrintWriter out = new PrintWriter(System.out, true); protected static BufferedReader reader = new BufferedReader(new InputStreamReader(System.in)); + /************************* + * Methods + *************************/ + //Сам метод регистрации. private static void registration() { String login, pass1, @@ -46,20 +42,19 @@ private static void registration() { break; } } catch (IllegalArgumentException e) { - out.println(e.getMessage()); - registration(); + out.println(Resources.language.getWRONG_CHOICE()); } catch (IOException e) { out.println(Resources.language.getIO_ERROR()); MainMenu.mainMenu(); } catch (JDOMException e) { - e.printStackTrace(); + out.println(Resources.language.getXML_ERROR()); } catch (SAXException e) { - e.printStackTrace(); + out.println(Resources.language.getXML_ERROR()); } catch (ParseException e) { - e.printStackTrace(); + out.println(Resources.language.getPARSE_ERROR()); } } - + //Автроизация пользователя. private static void authorization() throws JDOMException, SAXException, ParseException { String login, pass; @@ -76,9 +71,8 @@ private static void authorization() throws JDOMException, SAXException, ParseExc MainMenu.mainMenu(); } } - + //Загрузка даных пользователя. protected static void loadUserData(String login, String pass) throws JDOMException, SAXException, ParseException, IOException { - String message = UserData.loadData(login, pass, Resources.traditions, Resources.countries, Resources.holidays); if (!message.isEmpty()) { @@ -87,13 +81,12 @@ protected static void loadUserData(String login, String pass) throws JDOMExcepti } else out.println(Resources.language.getHELLO_USER() + login); } - + //Меню авторизации. protected static void logIn() { out.println(Resources.language.getENTER_MESSAGE()); int choice; try { choice = Integer.parseInt(reader.readLine()); - switch (choice) { case 1: authorization(); @@ -116,11 +109,11 @@ protected static void logIn() { out.println(Resources.language.getIO_ERROR()); logIn(); } catch (JDOMException e) { - e.printStackTrace(); + out.println(Resources.language.getXML_ERROR()); } catch (SAXException e) { - e.printStackTrace(); + out.println(Resources.language.getXML_ERROR()); } catch (ParseException e) { - e.printStackTrace(); + out.println(Resources.language.getPARSE_ERROR()); } } diff --git a/console/src/user_interface/myServer.java b/console/src/user_interface/myServer.java index 537ce95..1974b51 100644 --- a/console/src/user_interface/myServer.java +++ b/console/src/user_interface/myServer.java @@ -3,6 +3,7 @@ //import functional.XmlFileWorking; import functional.*; +import lang.Language; import model.*; import org.jdom2.Document; import org.jdom2.Element; @@ -36,18 +37,19 @@ public class myServer implements Runnable { + public myServer(Socket socket) { this.connection = socket; clientCount++; } - public static void serverInit() throws IOException { + public static void serverInit() throws IOException {//Запись в лог файл начало сессии try { Resources.sw = new FileWriter(Resources.serverLogDirect, true); Resources.sw.write("\n" + "Session started: " + new java.util.Date().toString() + "\n"); Resources.sw.close(); } catch (IOException e) { - System.out.println("Ошибка в создании при работе с Log файлом!"); + System.out.println(Resources.language.getLOG_FILE_ERROR()); } ServerSocket servers = null; @@ -55,7 +57,7 @@ public static void serverInit() throws IOException { try { servers = new ServerSocket(4444); } catch (IOException e) { - System.out.println("Невозможно запустить сервер, порт занят!"); + System.out.println(Resources.language.getSERVER_PORT_ERROR()); System.exit(-1); } //Ждем подключения клиента, запускаем поток на каждое подключение @@ -66,7 +68,7 @@ public static void serverInit() throws IOException { Thread thread = new Thread(runnable); thread.start(); } catch (IOException e) { - System.out.println("Ошибка при создании потока!"); + System.out.println(Resources.language.getTHREAD_ERROR()); System.exit(-1); } } @@ -89,14 +91,14 @@ public void run() { try { Resources.sw = new FileWriter(Resources.serverLogDirect, true); - Resources.sw.write(("\n Client " + name + " connected " + new Date())); + Resources.sw.write(("\n Client " + name + " connected " + new Date())); // клиент подключился, записываем в лог файл System.out.println("Client " + name + " connected " + new Date()); Resources.sw.close(); clientCount++; } catch(IOException e){ - System.out.println("Ошибка в создании при работе с Log файлом!"); + System.out.println(Resources.language.getLOG_FILE_ERROR()); } } } @@ -104,7 +106,6 @@ public void run() { //чистаем сообщения клиента while (true) { if ((input = inServer.readLine()) != null) { - System.out.println(input); try { if ("getCountry".equals(input)) { xmlFileWorking.saveCountry(countries, TEMP_FOLDER + name + TEMP_XML); @@ -120,13 +121,11 @@ public void run() { input = null; } else if ("loadAllData".equals(input)){ try { - System.out.println("Дошло до LoadAll"); - if (UserData.currentUser == null) xmlFileWorking.loadGuest(traditions, countries, holidays); else xmlFileWorking.loadUser(traditions,countries,holidays); } catch (SAXException e) { - e.printStackTrace(); + System.out.println(Resources.language.getXML_ERROR()); } } else if ("logOut".equals(input)){ @@ -137,30 +136,32 @@ else if ("logOut".equals(input)){ Thread.currentThread().stop();} else{ - temp = getMethodFromClient(input); + temp = getMethodFromClient(input); //расшифровывам и результат отправляем обратно outServer.println(temp); input = null; temp = null; } } catch (JDOMException e) { + System.out.println(Resources.language.getXML_ERROR()); //ошибки в хмле } catch (ParseException e) { + System.out.println(Resources.language.getPARSE_ERROR()); } - //Здесь расшифровываем сообщения и вызываем нужные методы - //после чего отправляем результат обратно + } } }catch(IOException e){ + System.out.println(Resources.language.getIO_ERROR()); } } - public String getMethodFromClient(String inputMessage) throws IOException, JDOMException, ParseException { + public String getMethodFromClient(String inputMessage) throws IOException, JDOMException, ParseException { //Расшифровываем и вызываем нужные методы PrintWriter printWriter; File file = new File(TEMP_FOLDER + name + TEMP_XML); file.createNewFile(); @@ -185,7 +186,7 @@ public String getMethodFromClient(String inputMessage) throws IOException, JDOME holidays.add(holiday); xmlFileWorking.saveHolidays(holidays, (TEMP_FOLDER + name + TEMP_XML)); } catch (SAXException e) { - e.printStackTrace(); + System.out.println(Resources.language.getXML_ERROR()); } return xmlFileWorking.xmlToString(TEMP_FOLDER + name + TEMP_XML); } @@ -201,6 +202,11 @@ public String getMethodFromClient(String inputMessage) throws IOException, JDOME return xmlFileWorking.xmlToString(TEMP_FOLDER + name + TEMP_XML); } + if ("searchByDate".equals(root.getName())) { + xmlFileWorking.saveTradition(Search.searchDate(xmlFileWorking.getDateFromClient_dateSearch(TEMP_FOLDER + name + TEMP_XML), + holidays, traditions), TEMP_FOLDER + name + TEMP_XML); + return xmlFileWorking.xmlToString(TEMP_FOLDER + name + TEMP_XML); + } if ("regularSearch".equals(root.getName())) { xmlFileWorking.saveTradition(Search.regularSearch(xmlFileWorking.getRequestFromClient_regularSearch(TEMP_FOLDER + name + TEMP_XML), traditions), TEMP_FOLDER + name + TEMP_XML); @@ -220,7 +226,6 @@ public String getMethodFromClient(String inputMessage) throws IOException, JDOME if ("change".equals(root.getName())) { } if ("registration".equals(root.getName())) { - System.out.println("Дошло до регистрации"); if ((Registration.checkLogin(root.getChild("dataReg").getAttributeValue("login")) == true) & (!(root.getChild("dataReg").getAttributeValue("pass1") .equals(root.getChild("dataReg").getAttributeValue("pass2"))))) { @@ -230,15 +235,14 @@ public String getMethodFromClient(String inputMessage) throws IOException, JDOME Registration.registration(root.getChild("dataReg").getAttributeValue("login"), root.getChild("dataReg").getAttributeValue("pass1"), root.getChild("dataReg").getAttributeValue("pass2")); - System.out.println("Запара в load data "); UserData.loadData(root.getChild("dataReg").getAttributeValue("login"), root.getChild("dataReg").getAttributeValue("pass1"), traditions, countries, holidays); - System.out.println("регистрация прошла успешно"); + // Resources.traditions, Resources.countries, Resources.holidays передаем пользователю //Загужаем традиции } catch (SAXException e) { - e.printStackTrace(); + System.out.println(Resources.language.getXML_ERROR()); } } @@ -267,7 +271,7 @@ public String getMethodFromClient(String inputMessage) throws IOException, JDOME User.copyFile(f1, f2); } catch (SAXException e) { - e.printStackTrace(); + System.out.println(Resources.language.getXML_ERROR()); } } if ("traditionSave".equals(root.getName())) { @@ -278,7 +282,7 @@ public String getMethodFromClient(String inputMessage) throws IOException, JDOME User.copyFile(f1, f2); } catch (SAXException e) { - e.printStackTrace(); + System.out.println(Resources.language.getXML_ERROR()); } diff --git a/functions/src/functional/Registration.java b/functions/src/functional/Registration.java index 77c4b84..bc09c81 100644 --- a/functions/src/functional/Registration.java +++ b/functions/src/functional/Registration.java @@ -25,22 +25,22 @@ public class Registration { private Registration() { } - - + /************************ + * Methods + ************************/ + //Метод регистрации. public static void registration(String login, String pass1, String pass2 ) throws IllegalArgumentException, IOException, JDOMException, SAXException, ParseException { - + //Устанавливаем модуль для шифрование пароля. UserData.rsa.setModulus(new BigInteger("114300212443049308755638385038607092399228059171843074638659728066396329731870812301666900170326603999649607364454783561463395729169397992550553334308251756497995161575531048559625701582012129417669546314420880750128408561569822198960212709010390091463374475374736305384151906473683969549684741213893356703077")); BigInteger pass = new BigInteger(pass1.getBytes()); - + //Создаем нового пользователя. User user = new User(login, pass, UserData.rsa.getPublicKey(), UserData.rsa.getModulus(), UserData.rsa); - UserData.users.add(user); - // UserData.loadData(login, pass1, traditions, countries, holidays); } - + //Проверка корректности логина. public static boolean checkLogin(String login) { boolean result = false; for (int i = 0; i < UserData.users.size(); i++) { diff --git a/functions/src/functional/Remove.java b/functions/src/functional/Remove.java index 19537d7..289ba64 100644 --- a/functions/src/functional/Remove.java +++ b/functions/src/functional/Remove.java @@ -33,7 +33,7 @@ public static void removeListHoliday(List holidayList, List fr } public static void removeTradition(int id, List traditions) { - if (id >= UserData.traditionCount && id < traditions.size()) { + if (id >= 0 && id < traditions.size()) { traditions.remove(id); } else throw new IndexOutOfBoundsException(); diff --git a/functions/src/functional/Search.java b/functions/src/functional/Search.java index d35a1fe..b5291ea 100644 --- a/functions/src/functional/Search.java +++ b/functions/src/functional/Search.java @@ -2,6 +2,8 @@ import model.*; +import javax.swing.*; +import java.text.ParseException; import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -37,6 +39,62 @@ public static ArrayList search(String request, ArrayList t return searchResult; } + public static ArrayList searchDate(String dateValue, LinkedList holidayList, ArrayList traditionList) { + try { + LinkedList traditionHolidays = new LinkedList(); + for (Tradition item : traditionList) { + traditionHolidays.add(item.getHoliday()); + } + Date date = Holiday.dateFormat.parse(dateValue); + if (Search.getDateHolidays(date, traditionHolidays).size() != 0) { + LinkedList holidays = Search.getDateHolidays(date, traditionHolidays); + + ArrayList traditions = new ArrayList();//Search.getTraditions(holidays.get(0), traditionList); + for (Holiday item : holidays) { + for (Tradition tradition : Search.getTraditions(item, traditionList)) { + traditions.add(tradition); + } + } + traditionList = traditions; + } + } catch (IndexOutOfBoundsException exc) { + JOptionPane.showMessageDialog(null, "IndexOutOfBoundsException"); + } + catch (ParseException exc) { + JOptionPane.showMessageDialog(null, "ParseException"); + } + return traditionList; + } + + public static ArrayList searchDate(ArrayList dateValue, LinkedList holidayList, ArrayList traditionList) { + try { + LinkedList traditionHolidays = new LinkedList(); + for (Tradition item : traditionList) { + traditionHolidays.add(item.getHoliday()); + } + //ArrayList dates = new ArrayList(); + ArrayList traditions = new ArrayList(); + for (String item : dateValue) { + Date date = Holiday.dateFormat.parse(item); + if (Search.getDateHolidays(date, traditionHolidays).size() != 0) { + LinkedList holidays = Search.getDateHolidays(date, traditionHolidays); + + for (Holiday holiday : holidays) { + for (Tradition tradition : Search.getTraditions(holiday, traditionList)) { + traditions.add(tradition); + } + } + } + } + traditionList = traditions; + } catch (IndexOutOfBoundsException exc) { + JOptionPane.showMessageDialog(null, "IndexOutOfBoundsException"); + } + catch (ParseException exc) { + JOptionPane.showMessageDialog(null, "ParseException"); + } + return traditionList; + } public static ArrayList maskSearch(String holidayName, String countryName, String description, ArrayList traditions) { // Введите название -> Enter Введите страну -> Enter итд Если перенесем на форму будет удобнее ArrayList searchResult = new ArrayList(); diff --git a/functions/src/functional/UserData.java b/functions/src/functional/UserData.java index 37c4568..30b3f58 100644 --- a/functions/src/functional/UserData.java +++ b/functions/src/functional/UserData.java @@ -18,74 +18,50 @@ */ public class UserData { - public static int traditionCount = 0; - public static int countryCount = 0; - public static int holidayCount = 0; + /******************** + * Components + ********************/ public static RSA rsa = new RSA(); public static User currentUser; XmlFileWorking xmlFileWorking = new XmlFileWorking(); - public static ArrayList users = new ArrayList(); - - public static void registration(String login, String pass1, String pass2,ArrayList traditions, LinkedList countries, LinkedList holidays - ) throws IllegalArgumentException, IOException, JDOMException, SAXException, ParseException { - if (pass1.equals(pass2)) { - rsa.setModulus(new BigInteger("114300212443049308755638385038607092399228059171843074638659728066396329731870812301666900170326603999649607364454783561463395729169397992550553334308251756497995161575531048559625701582012129417669546314420880750128408561569822198960212709010390091463374475374736305384151906473683969549684741213893356703077")); - BigInteger pass = new BigInteger(pass1.getBytes()); - User user = new User(login, pass, rsa.getPublicKey(), - rsa.getModulus(),rsa); - users.add(user); - loadData(login, pass1, traditions, countries, holidays); - } else { - throw new IllegalArgumentException(); - } - } - + /********************* + * Constructors + *********************/ + //Загрузка данных пользователя. public static String loadData(String login, String pass, ArrayList traditions, LinkedList countries, LinkedList holidays) throws JDOMException, SAXException, ParseException, IOException { - if (authentication(login, pass)) { - traditionCount = traditions.size(); - countryCount = countries.size(); - holidayCount = holidays.size(); - currentUser = users.get(Search.searchIndex(users, login)); - new XmlFileWorking().loadUser(traditions,countries,holidays); - return "ok"; - } return "Error"; } public static void logOut(ArrayList traditions, List countries, List holidays) throws IOException { - ArrayList tr_list = new ArrayList(); - for (int i = traditionCount; i < traditions.size(); i++) { + for (int i = 0; i < traditions.size(); i++) { tr_list.add(traditions.get(i)); } currentUser.setTraditionList(tr_list); Remove.removeListTradition(tr_list,traditions); LinkedList c_list = new LinkedList(); - for (int i = countryCount; i < countries.size(); i++) { + for (int i = 0; i < countries.size(); i++) { c_list.add(countries.get(i)); } currentUser.setCountryList(c_list); Remove.removeListCountry(c_list,countries); LinkedList h_list = new LinkedList(); - for (int i = holidayCount; i < holidays.size(); i++) { + for (int i = 0; i < holidays.size(); i++) { h_list.add(holidays.get(i)); } currentUser.setHolidayList(h_list); Remove.removeListHoliday(h_list,holidays); new XmlFileWorking().saveUser(traditions,holidays,countries); - traditionCount = 0; - countryCount = 0; - holidayCount = 0; } - + //Проверка вводимого пароля. public static boolean authentication(String login, String pass) { int index = -1; for (int i = 0; i < users.size(); i++) { @@ -95,7 +71,6 @@ public static boolean authentication(String login, String pass) { } } - UserData.rsa.setModulus(new BigInteger("114300212443049308755638385038607092399228059171843074638659728066396329731870812301666900170326603999649607364454783561463395729169397992550553334308251756497995161575531048559625701582012129417669546314420880750128408561569822198960212709010390091463374475374736305384151906473683969549684741213893356703077")); BigInteger message = new BigInteger(pass.getBytes()); BigInteger encrypt = UserData.rsa.encrypt(message); diff --git a/functions/src/functional/XmlFileWorking.java b/functions/src/functional/XmlFileWorking.java index d8aa28c..1805603 100644 --- a/functions/src/functional/XmlFileWorking.java +++ b/functions/src/functional/XmlFileWorking.java @@ -16,10 +16,7 @@ import javax.xml.validation.Validator; import java.io.*; import java.text.ParseException; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; +import java.util.*; /* Created by Михаил on 09.03.2015. @@ -35,6 +32,9 @@ public class XmlFileWorking implements DataSaveLoad { private final String TEMP_XML = "/resources/temp/temp.xml"; private SAXBuilder builder = new SAXBuilder(); + + // Огромный километровый класс. Придумайте, как разбить на несколько классов, переиспользовать код и избавиться от кучи констант. + // Потом посмотрю детально реализацию public void saveUser(ArrayList traditions, List holidays, List countries) throws IOException { this.saveTradition(traditions, ROOT + UserData.currentUser.getLogin() + TRADITION_FILE); this.saveHolidays(holidays, ROOT + UserData.currentUser.getLogin() + HOLIDAY_FILE); @@ -42,9 +42,8 @@ public void saveUser(ArrayList traditions, List holidays, Li } public void loadUser(ArrayList traditions, LinkedList countries, LinkedList holidays) throws JDOMException, SAXException, ParseException, IOException { - System.out.println("load"); - System.out.println("loadData" + UserData.currentUser.getLogin() + "пусто"); + for (Tradition item : loadTradition(ROOT + UserData.currentUser.getLogin() + TRADITION_FILE)) { traditions.add(item); @@ -59,9 +58,7 @@ public void loadUser(ArrayList traditions, LinkedList countr } public void loadGuest(ArrayList traditions, LinkedList countries, LinkedList holidays) throws JDOMException, SAXException, ParseException, IOException { - System.out.println("load"); - System.out.println("loadGuestData"); - for (Tradition item : loadTradition(XML_TRADITION_PATCH_RU)) { + for (Tradition item : loadTradition(XML_TRADITION_PATCH_RU)) { traditions.add(item); } @@ -323,7 +320,7 @@ public void saveAll(ArrayList traditions, List countries, Li saveUsers(UserData.users, XML_USERS); } - public boolean validationXSD(String directXML, String directXSD) throws IOException { + public boolean validationXSD(String directXML, String directXSD) throws IOException { //валидация хмл try { @@ -339,7 +336,7 @@ public boolean validationXSD(String directXML, String directXSD) throws IOExcept } - public String xmlToString(String direct) { + public String xmlToString(String direct) { //преобразуем хмл в стринг String s = ""; File file = new File(direct); @@ -360,16 +357,16 @@ public String xmlToString(String direct) { } catch (FileNotFoundException e) { - System.out.println("Файл не найден"); + System.out.println("File not found"); } } catch (IOException e) { - + System.out.println("xml to string error."); } return s; } - public void stringToXML(String direct, String inputMessage) { + public void stringToXML(String direct, String inputMessage) { //преобразуем стринг в хмл файл PrintWriter printWriter; File file = new File(direct); try { @@ -379,12 +376,12 @@ public void stringToXML(String direct, String inputMessage) { printWriter.print(inputMessage); printWriter.close(); } catch (IOException e) { - System.out.println("StringToXml ошибка"); + System.out.println("StringToXml Error"); } } - public String sendHolidaysToServer_ADD(Holiday holiday) throws IOException { + public String sendHolidaysToServer_ADD(Holiday holiday) throws IOException { //отправка на сервер праздника Element root = new Element("addHoliday"); Document doc = new Document(root); Element holidayElement = new Element("holiday"); @@ -411,7 +408,7 @@ public String sendHolidaysToServer_ADD(Holiday holiday) throws IOException { } - public Holiday getHolidayFromClient_ADD(String direct) throws IOException, JDOMException, ParseException, SAXException { + public Holiday getHolidayFromClient_ADD(String direct) throws IOException, JDOMException, ParseException, SAXException { //получение праздника от клиента Document document = builder.build(direct); Element root = document.getRootElement(); @@ -428,7 +425,7 @@ public Holiday getHolidayFromClient_ADD(String direct) throws IOException, JDOME return holiday; } - public String sendCountryToServer_ADD(Country country) throws IOException { + public String sendCountryToServer_ADD(Country country) throws IOException {//отправка страны на сервер Element root = new Element("addCountry"); Document doc = new Document(root); Element countryElement = new Element("country"); @@ -443,7 +440,7 @@ public String sendCountryToServer_ADD(Country country) throws IOException { } - public Country getCountryFromClient_ADD(String direct) throws IOException, JDOMException { + public Country getCountryFromClient_ADD(String direct) throws IOException, JDOMException {//расшифровка добавление Document document = builder.build(direct); Element root = document.getRootElement(); List countryElem = root.getChildren(); @@ -456,7 +453,7 @@ public Country getCountryFromClient_ADD(String direct) throws IOException, JDOME return country; } - public String sendTraditionToServer_ADD(Tradition tradition) throws IOException { //пользователь делает xml для отправки на сервер + public String sendTraditionToServer_ADD(Tradition tradition) throws IOException { //Запрос на добавление Element root = new Element("addTradition"); Document doc = new Document(root); Element traditionElement = new Element("tradition"); @@ -532,7 +529,7 @@ public Tradition getTraditionFromClient_ADD(String direct) throws JDOMException, } //получаем традицию и кидаем в метод добавления - public String sendRequestToServer_Search(String request) throws IOException { //пользователь делает xml для отправки на сервер + public String sendRequestToServer_Search(String request) throws IOException { //запрос на поиск Element root = new Element("search"); Document doc = new Document(root); Element traditionElement = new Element("searchRequest"); @@ -542,14 +539,31 @@ public String sendRequestToServer_Search(String request) throws IOException { // return outputter.outputString(doc); } - public String getRequestFromClient_Search(String direct) throws JDOMException, IOException, ParseException { + public String getRequestFromClient_Search(String direct) throws JDOMException, IOException, ParseException { //расшифровка на обычный поиск Document document = builder.build(direct); Element root = document.getRootElement(); return root.getChild("searchRequest").getAttributeValue("request"); } - public String sendRequestToServer_regularSearch(String request) throws IOException { //пользователь делает xml для отправки на сервер + public String sendDateToServer_dateSearch(Date request) throws IOException { //поиск по дате + Element root = new Element("searchByDate"); + Document doc = new Document(root); + Element traditionElement = new Element("searchDate"); + traditionElement.setAttribute("date", Holiday.dateFormat.format(request)); + root.addContent(traditionElement); + XMLOutputter outputter = new XMLOutputter(); + return outputter.outputString(doc); + } + + public String getDateFromClient_dateSearch(String direct) throws JDOMException, IOException, ParseException { //поиск по дате + Document document = builder.build(direct); + Element root = document.getRootElement(); + return root.getChild("searchDate").getAttributeValue("date"); + + } + + public String sendRequestToServer_regularSearch(String request) throws IOException { //запрос на поиск по регулярному выражению Element root = new Element("regularSearch"); Document doc = new Document(root); Element traditionElement = new Element("regularSearchRequest"); @@ -559,14 +573,14 @@ public String sendRequestToServer_regularSearch(String request) throws IOExcepti return outputter.outputString(doc); } - public String getRequestFromClient_regularSearch(String direct) throws JDOMException, IOException, ParseException { + public String getRequestFromClient_regularSearch(String direct) throws JDOMException, IOException, ParseException {//расшифровка на поиск по регулярному выражению Document document = builder.build(direct); Element root = document.getRootElement(); return root.getChild("regularSearchRequest").getAttributeValue("request"); } - public String sendRequestToServer_maskSearch(String name, String country, String description) throws IOException { + public String sendRequestToServer_maskSearch(String name, String country, String description) throws IOException { //запрос на посиск по маске Element root = new Element("maskSearch"); Document doc = new Document(root); Element traditionElement = new Element("maskSearchRequest"); @@ -578,25 +592,25 @@ public String sendRequestToServer_maskSearch(String name, String country, String return outputter.outputString(doc); } - public String getRequestFromClient_maskSearchHolidayName(String direct) throws JDOMException, IOException, ParseException { + public String getRequestFromClient_maskSearchHolidayName(String direct) throws JDOMException, IOException, ParseException { //запрос на поиск по маске - имя праздника Document document = builder.build(direct); Element root = document.getRootElement(); return root.getChild("maskSearchRequest").getAttributeValue("holidayName"); } - public String getRequestFromClient_maskSearchCountryName(String direct) throws JDOMException, IOException, ParseException { + public String getRequestFromClient_maskSearchCountryName(String direct) throws JDOMException, IOException, ParseException { //запрос на поиск по маске - имя страны Document document = builder.build(direct); Element root = document.getRootElement(); return root.getChild("maskSearchRequest").getAttributeValue("countryName"); } - public String getRequestFromClient_maskSearchDescriptionName(String direct) throws JDOMException, IOException, ParseException { + public String getRequestFromClient_maskSearchDescriptionName(String direct) throws JDOMException, IOException, ParseException { //запрос на поиск по маске - описание Document document = builder.build(direct); Element root = document.getRootElement(); return root.getChild("maskSearchRequest").getAttributeValue("description"); } - public String sendIdToServer_Remove(int id) throws IOException { //пользователь делает xml для отправки на сервер + public String sendIdToServer_Remove(int id) throws IOException { //Отправка ид для удаления Element root = new Element("remove"); Document doc = new Document(root); Element traditionElement = new Element("traditionId"); @@ -606,14 +620,14 @@ public String sendIdToServer_Remove(int id) throws IOException { //пользо return outputter.outputString(doc); } - public String getIdFromClient_Remove(String direct) throws JDOMException, IOException, ParseException { + public String getIdFromClient_Remove(String direct) throws JDOMException, IOException, ParseException { //получение ид для удаления Document document = builder.build(direct); Element root = document.getRootElement(); return root.getChild("traditionId").getAttributeValue("id"); } - public String sendDataRegToServer_Registration(String login, String pass1, String pass2) throws IOException { //пользователь делает xml для отправки на сервер + public String sendDataRegToServer_Registration(String login, String pass1, String pass2) throws IOException { //Запрос регистрации на сервер Element root = new Element("registration"); Document doc = new Document(root); Element traditionElement = new Element("dataReg"); @@ -625,8 +639,8 @@ public String sendDataRegToServer_Registration(String login, String pass1, Strin return outputter.outputString(doc); } - public String sendDataLogInToServer_LogIn(String login, String pass1) throws IOException { //пользователь делает xml для отправки на сервер - Element root = new Element("logIn"); + public String sendDataLogInToServer_LogIn(String login, String pass1) throws IOException { //отправка логина и пароля на сервер + Element root = new Element("logIn"); Document doc = new Document(root); Element traditionElement = new Element("dataLogIn"); traditionElement.setAttribute("login", login); diff --git a/language/src/lang/Language.java b/language/src/lang/Language.java index 33a8e8f..23cfdbb 100644 --- a/language/src/lang/Language.java +++ b/language/src/lang/Language.java @@ -6,12 +6,12 @@ public interface Language { public String getPASSWORD(); - public String getHELP(); + public String getHELP(); public String getREAD(); public String getCHANGE(); - public String getSUBSTRING(); + public String getSUBSTRING(); public String getREGULAR(); public String getMASK(); @@ -168,4 +168,10 @@ public interface Language { public String getSEARCH_BY_DATE_INTERVAL(); public String getCHOOSE_SEARCH_PARAM(); public String getAND_LABEL(); + + + public String getLOG_FILE_ERROR(); + public String getSERVER_PORT_ERROR(); + public String getTHREAD_ERROR(); } + diff --git a/language/src/lang/Strings_EN.java b/language/src/lang/Strings_EN.java index 607d686..2b6f111 100644 --- a/language/src/lang/Strings_EN.java +++ b/language/src/lang/Strings_EN.java @@ -101,6 +101,9 @@ public class Strings_EN implements Language { private final String CHOOSE_SEARCH_PARAM = "Choose search params"; private final String AND_LABEL = "And"; + private final String LOG_FILE_ERROR = "Log file error!"; + private final String SERVER_PORT_ERROR = "Port unreachable!"; + private final String THREAD_ERROR = "Unable to create thread!"; public String getALL_EVENT() { return ALL_EVENT; @@ -510,6 +513,19 @@ public String getAND_LABEL(){ return AND_LABEL; } + @Override + public String getLOG_FILE_ERROR() { + return LOG_FILE_ERROR; + } + @Override + public String getSERVER_PORT_ERROR() { + return SERVER_PORT_ERROR; + } + + @Override + public String getTHREAD_ERROR() { + return THREAD_ERROR; + } } diff --git a/language/src/lang/Strings_RU.java b/language/src/lang/Strings_RU.java index 8c0541c..5ff5974 100644 --- a/language/src/lang/Strings_RU.java +++ b/language/src/lang/Strings_RU.java @@ -99,6 +99,10 @@ public class Strings_RU implements Language { private final String SHOW_OR_EDIT = "Показать / Изменить описание"; private final String NOT_FOUND_DESCRIPTION = "Описание отсутствует"; + private final String LOG_FILE_ERROR = "Ошибка в Log файле!"; + private final String SERVER_PORT_ERROR = "Порт занят!"; + private final String THREAD_ERROR = "Невозможно создать поток!"; + public String getNOT_FOUND_DESCRIPTION() { return NOT_FOUND_DESCRIPTION; } @@ -123,6 +127,21 @@ public String getAND_LABEL() { return null; } + @Override + public String getLOG_FILE_ERROR() { + return LOG_FILE_ERROR; + } + + @Override + public String getSERVER_PORT_ERROR() { + return SERVER_PORT_ERROR; + } + + @Override + public String getTHREAD_ERROR() { + return THREAD_ERROR; + } + public String getSHOW() { return SHOW; } @@ -526,4 +545,5 @@ public String getDATE() { public String getGUEST_MAIN_MENU(){ return GUEST_MAIN_MENU; } + } diff --git a/out/artifacts/func/func.jar b/out/artifacts/func/func.jar index 69c9e90..2bf4d63 100644 Binary files a/out/artifacts/func/func.jar and b/out/artifacts/func/func.jar differ diff --git a/out/production/NewProject/META-INF/main.mf b/out/production/NewProject/META-INF/main.mf deleted file mode 100644 index 9d885be..0000000 --- a/out/production/NewProject/META-INF/main.mf +++ /dev/null @@ -1 +0,0 @@ -Manifest-Version: 1.0 diff --git a/out/production/NewProject/langlib.jar b/out/production/NewProject/langlib.jar index 9674c16..634d2f4 100644 Binary files a/out/production/NewProject/langlib.jar and b/out/production/NewProject/langlib.jar differ diff --git a/out/production/NewProject/main/MainClass.class b/out/production/NewProject/main/MainClass.class deleted file mode 100644 index 48aa8e9..0000000 Binary files a/out/production/NewProject/main/MainClass.class and /dev/null differ diff --git a/out/production/NewProject/main/Resources.class b/out/production/NewProject/main/Resources.class deleted file mode 100644 index 21c4e18..0000000 Binary files a/out/production/NewProject/main/Resources.class and /dev/null differ diff --git a/out/production/NewProject/model/Country.class b/out/production/NewProject/model/Country.class deleted file mode 100644 index 4d7b37b..0000000 Binary files a/out/production/NewProject/model/Country.class and /dev/null differ diff --git a/out/production/NewProject/model/Holiday.class b/out/production/NewProject/model/Holiday.class deleted file mode 100644 index 336eeab..0000000 Binary files a/out/production/NewProject/model/Holiday.class and /dev/null differ diff --git a/out/production/NewProject/model/HolidayType.class b/out/production/NewProject/model/HolidayType.class deleted file mode 100644 index 2aeaf77..0000000 Binary files a/out/production/NewProject/model/HolidayType.class and /dev/null differ diff --git a/out/production/NewProject/model/RSA.class b/out/production/NewProject/model/RSA.class deleted file mode 100644 index c66f72c..0000000 Binary files a/out/production/NewProject/model/RSA.class and /dev/null differ diff --git a/out/production/NewProject/model/Tradition.class b/out/production/NewProject/model/Tradition.class deleted file mode 100644 index 43d1763..0000000 Binary files a/out/production/NewProject/model/Tradition.class and /dev/null differ diff --git a/out/production/NewProject/model/User.class b/out/production/NewProject/model/User.class deleted file mode 100644 index 9d586b3..0000000 Binary files a/out/production/NewProject/model/User.class and /dev/null differ diff --git a/out/production/NewProject/modules/functional/Add.class b/out/production/NewProject/modules/functional/Add.class deleted file mode 100644 index d14d37b..0000000 Binary files a/out/production/NewProject/modules/functional/Add.class and /dev/null differ diff --git a/out/production/NewProject/modules/functional/Change.class b/out/production/NewProject/modules/functional/Change.class deleted file mode 100644 index 6acc066..0000000 Binary files a/out/production/NewProject/modules/functional/Change.class and /dev/null differ diff --git a/out/production/NewProject/modules/functional/DataSaveLoad.class b/out/production/NewProject/modules/functional/DataSaveLoad.class deleted file mode 100644 index 0371df4..0000000 Binary files a/out/production/NewProject/modules/functional/DataSaveLoad.class and /dev/null differ diff --git a/out/production/NewProject/modules/functional/DateLabelFormatter.class b/out/production/NewProject/modules/functional/DateLabelFormatter.class deleted file mode 100644 index 7bf617a..0000000 Binary files a/out/production/NewProject/modules/functional/DateLabelFormatter.class and /dev/null differ diff --git a/out/production/NewProject/modules/functional/Remove.class b/out/production/NewProject/modules/functional/Remove.class deleted file mode 100644 index 10b0d8b..0000000 Binary files a/out/production/NewProject/modules/functional/Remove.class and /dev/null differ diff --git a/out/production/NewProject/modules/functional/Search.class b/out/production/NewProject/modules/functional/Search.class deleted file mode 100644 index 32f4bd8..0000000 Binary files a/out/production/NewProject/modules/functional/Search.class and /dev/null differ diff --git a/out/production/NewProject/modules/functional/SerFileWorking.class b/out/production/NewProject/modules/functional/SerFileWorking.class deleted file mode 100644 index 7e473c2..0000000 Binary files a/out/production/NewProject/modules/functional/SerFileWorking.class and /dev/null differ diff --git a/out/production/NewProject/modules/functional/XmlFileWorking.class b/out/production/NewProject/modules/functional/XmlFileWorking.class deleted file mode 100644 index fc1534d..0000000 Binary files a/out/production/NewProject/modules/functional/XmlFileWorking.class and /dev/null differ diff --git a/out/production/NewProject/modules/gui_interface/AddWindow$1.class b/out/production/NewProject/modules/gui_interface/AddWindow$1.class deleted file mode 100644 index d1bb089..0000000 Binary files a/out/production/NewProject/modules/gui_interface/AddWindow$1.class and /dev/null differ diff --git a/out/production/NewProject/modules/gui_interface/AddWindow$2.class b/out/production/NewProject/modules/gui_interface/AddWindow$2.class deleted file mode 100644 index c857b28..0000000 Binary files a/out/production/NewProject/modules/gui_interface/AddWindow$2.class and /dev/null differ diff --git a/out/production/NewProject/modules/gui_interface/AddWindow$AddListener.class b/out/production/NewProject/modules/gui_interface/AddWindow$AddListener.class deleted file mode 100644 index 503a39c..0000000 Binary files a/out/production/NewProject/modules/gui_interface/AddWindow$AddListener.class and /dev/null differ diff --git a/out/production/NewProject/modules/gui_interface/AddWindow$CountryListener.class b/out/production/NewProject/modules/gui_interface/AddWindow$CountryListener.class deleted file mode 100644 index bb8defb..0000000 Binary files a/out/production/NewProject/modules/gui_interface/AddWindow$CountryListener.class and /dev/null differ diff --git a/out/production/NewProject/modules/gui_interface/AddWindow$HolidayListener.class b/out/production/NewProject/modules/gui_interface/AddWindow$HolidayListener.class deleted file mode 100644 index b80d012..0000000 Binary files a/out/production/NewProject/modules/gui_interface/AddWindow$HolidayListener.class and /dev/null differ diff --git a/out/production/NewProject/modules/gui_interface/AddWindow.class b/out/production/NewProject/modules/gui_interface/AddWindow.class deleted file mode 100644 index e5822af..0000000 Binary files a/out/production/NewProject/modules/gui_interface/AddWindow.class and /dev/null differ diff --git a/out/production/NewProject/modules/gui_interface/AdditionalSearchWindow$1.class b/out/production/NewProject/modules/gui_interface/AdditionalSearchWindow$1.class deleted file mode 100644 index 68b8132..0000000 Binary files a/out/production/NewProject/modules/gui_interface/AdditionalSearchWindow$1.class and /dev/null differ diff --git a/out/production/NewProject/modules/gui_interface/AdditionalSearchWindow$2.class b/out/production/NewProject/modules/gui_interface/AdditionalSearchWindow$2.class deleted file mode 100644 index c732a8c..0000000 Binary files a/out/production/NewProject/modules/gui_interface/AdditionalSearchWindow$2.class and /dev/null differ diff --git a/out/production/NewProject/modules/gui_interface/AdditionalSearchWindow$3.class b/out/production/NewProject/modules/gui_interface/AdditionalSearchWindow$3.class deleted file mode 100644 index 3106d9a..0000000 Binary files a/out/production/NewProject/modules/gui_interface/AdditionalSearchWindow$3.class and /dev/null differ diff --git a/out/production/NewProject/modules/gui_interface/AdditionalSearchWindow.class b/out/production/NewProject/modules/gui_interface/AdditionalSearchWindow.class deleted file mode 100644 index 4861bfa..0000000 Binary files a/out/production/NewProject/modules/gui_interface/AdditionalSearchWindow.class and /dev/null differ diff --git a/out/production/NewProject/modules/gui_interface/HelpWindow$1.class b/out/production/NewProject/modules/gui_interface/HelpWindow$1.class deleted file mode 100644 index 4a9bbf3..0000000 Binary files a/out/production/NewProject/modules/gui_interface/HelpWindow$1.class and /dev/null differ diff --git a/out/production/NewProject/modules/gui_interface/HelpWindow.class b/out/production/NewProject/modules/gui_interface/HelpWindow.class deleted file mode 100644 index f097672..0000000 Binary files a/out/production/NewProject/modules/gui_interface/HelpWindow.class and /dev/null differ diff --git a/out/production/NewProject/modules/gui_interface/LoginWindow$1.class b/out/production/NewProject/modules/gui_interface/LoginWindow$1.class deleted file mode 100644 index 3e3f779..0000000 Binary files a/out/production/NewProject/modules/gui_interface/LoginWindow$1.class and /dev/null differ diff --git a/out/production/NewProject/modules/gui_interface/LoginWindow$2.class b/out/production/NewProject/modules/gui_interface/LoginWindow$2.class deleted file mode 100644 index 514b9f5..0000000 Binary files a/out/production/NewProject/modules/gui_interface/LoginWindow$2.class and /dev/null differ diff --git a/out/production/NewProject/modules/gui_interface/LoginWindow$3.class b/out/production/NewProject/modules/gui_interface/LoginWindow$3.class deleted file mode 100644 index 7997108..0000000 Binary files a/out/production/NewProject/modules/gui_interface/LoginWindow$3.class and /dev/null differ diff --git a/out/production/NewProject/modules/gui_interface/LoginWindow$4.class b/out/production/NewProject/modules/gui_interface/LoginWindow$4.class deleted file mode 100644 index 6a49cf1..0000000 Binary files a/out/production/NewProject/modules/gui_interface/LoginWindow$4.class and /dev/null differ diff --git a/out/production/NewProject/modules/gui_interface/LoginWindow$5.class b/out/production/NewProject/modules/gui_interface/LoginWindow$5.class deleted file mode 100644 index 490a5db..0000000 Binary files a/out/production/NewProject/modules/gui_interface/LoginWindow$5.class and /dev/null differ diff --git a/out/production/NewProject/modules/gui_interface/LoginWindow$6.class b/out/production/NewProject/modules/gui_interface/LoginWindow$6.class deleted file mode 100644 index 7d7de95..0000000 Binary files a/out/production/NewProject/modules/gui_interface/LoginWindow$6.class and /dev/null differ diff --git a/out/production/NewProject/modules/gui_interface/LoginWindow$7.class b/out/production/NewProject/modules/gui_interface/LoginWindow$7.class deleted file mode 100644 index 4e8b998..0000000 Binary files a/out/production/NewProject/modules/gui_interface/LoginWindow$7.class and /dev/null differ diff --git a/out/production/NewProject/modules/gui_interface/LoginWindow.class b/out/production/NewProject/modules/gui_interface/LoginWindow.class deleted file mode 100644 index 66229db..0000000 Binary files a/out/production/NewProject/modules/gui_interface/LoginWindow.class and /dev/null differ diff --git a/out/production/NewProject/modules/gui_interface/MainWindow$1.class b/out/production/NewProject/modules/gui_interface/MainWindow$1.class deleted file mode 100644 index 23835b4..0000000 Binary files a/out/production/NewProject/modules/gui_interface/MainWindow$1.class and /dev/null differ diff --git a/out/production/NewProject/modules/gui_interface/MainWindow$10.class b/out/production/NewProject/modules/gui_interface/MainWindow$10.class deleted file mode 100644 index 0edb3b3..0000000 Binary files a/out/production/NewProject/modules/gui_interface/MainWindow$10.class and /dev/null differ diff --git a/out/production/NewProject/modules/gui_interface/MainWindow$2.class b/out/production/NewProject/modules/gui_interface/MainWindow$2.class deleted file mode 100644 index 7170955..0000000 Binary files a/out/production/NewProject/modules/gui_interface/MainWindow$2.class and /dev/null differ diff --git a/out/production/NewProject/modules/gui_interface/MainWindow$3.class b/out/production/NewProject/modules/gui_interface/MainWindow$3.class deleted file mode 100644 index d58ae53..0000000 Binary files a/out/production/NewProject/modules/gui_interface/MainWindow$3.class and /dev/null differ diff --git a/out/production/NewProject/modules/gui_interface/MainWindow$4.class b/out/production/NewProject/modules/gui_interface/MainWindow$4.class deleted file mode 100644 index 2b67e7e..0000000 Binary files a/out/production/NewProject/modules/gui_interface/MainWindow$4.class and /dev/null differ diff --git a/out/production/NewProject/modules/gui_interface/MainWindow$5.class b/out/production/NewProject/modules/gui_interface/MainWindow$5.class deleted file mode 100644 index 8dc69b4..0000000 Binary files a/out/production/NewProject/modules/gui_interface/MainWindow$5.class and /dev/null differ diff --git a/out/production/NewProject/modules/gui_interface/MainWindow$6.class b/out/production/NewProject/modules/gui_interface/MainWindow$6.class deleted file mode 100644 index 8f6a472..0000000 Binary files a/out/production/NewProject/modules/gui_interface/MainWindow$6.class and /dev/null differ diff --git a/out/production/NewProject/modules/gui_interface/MainWindow$7.class b/out/production/NewProject/modules/gui_interface/MainWindow$7.class deleted file mode 100644 index e610855..0000000 Binary files a/out/production/NewProject/modules/gui_interface/MainWindow$7.class and /dev/null differ diff --git a/out/production/NewProject/modules/gui_interface/MainWindow$8.class b/out/production/NewProject/modules/gui_interface/MainWindow$8.class deleted file mode 100644 index 6962f1a..0000000 Binary files a/out/production/NewProject/modules/gui_interface/MainWindow$8.class and /dev/null differ diff --git a/out/production/NewProject/modules/gui_interface/MainWindow$9.class b/out/production/NewProject/modules/gui_interface/MainWindow$9.class deleted file mode 100644 index ca63e6f..0000000 Binary files a/out/production/NewProject/modules/gui_interface/MainWindow$9.class and /dev/null differ diff --git a/out/production/NewProject/modules/gui_interface/MainWindow$descriptListener.class b/out/production/NewProject/modules/gui_interface/MainWindow$descriptListener.class deleted file mode 100644 index c3cd5d8..0000000 Binary files a/out/production/NewProject/modules/gui_interface/MainWindow$descriptListener.class and /dev/null differ diff --git a/out/production/NewProject/modules/gui_interface/MainWindow$removeListener.class b/out/production/NewProject/modules/gui_interface/MainWindow$removeListener.class deleted file mode 100644 index 3e0c094..0000000 Binary files a/out/production/NewProject/modules/gui_interface/MainWindow$removeListener.class and /dev/null differ diff --git a/out/production/NewProject/modules/gui_interface/MainWindow$styleListener.class b/out/production/NewProject/modules/gui_interface/MainWindow$styleListener.class deleted file mode 100644 index 5d5c42e..0000000 Binary files a/out/production/NewProject/modules/gui_interface/MainWindow$styleListener.class and /dev/null differ diff --git a/out/production/NewProject/modules/gui_interface/MainWindow.class b/out/production/NewProject/modules/gui_interface/MainWindow.class deleted file mode 100644 index 6518e9d..0000000 Binary files a/out/production/NewProject/modules/gui_interface/MainWindow.class and /dev/null differ diff --git a/out/production/NewProject/modules/gui_interface/RegistrationForm$1.class b/out/production/NewProject/modules/gui_interface/RegistrationForm$1.class deleted file mode 100644 index bcecc26..0000000 Binary files a/out/production/NewProject/modules/gui_interface/RegistrationForm$1.class and /dev/null differ diff --git a/out/production/NewProject/modules/gui_interface/RegistrationForm$2.class b/out/production/NewProject/modules/gui_interface/RegistrationForm$2.class deleted file mode 100644 index f6878bd..0000000 Binary files a/out/production/NewProject/modules/gui_interface/RegistrationForm$2.class and /dev/null differ diff --git a/out/production/NewProject/modules/gui_interface/RegistrationForm$3.class b/out/production/NewProject/modules/gui_interface/RegistrationForm$3.class deleted file mode 100644 index 902d69b..0000000 Binary files a/out/production/NewProject/modules/gui_interface/RegistrationForm$3.class and /dev/null differ diff --git a/out/production/NewProject/modules/gui_interface/RegistrationForm$4.class b/out/production/NewProject/modules/gui_interface/RegistrationForm$4.class deleted file mode 100644 index b85b657..0000000 Binary files a/out/production/NewProject/modules/gui_interface/RegistrationForm$4.class and /dev/null differ diff --git a/out/production/NewProject/modules/gui_interface/RegistrationForm.class b/out/production/NewProject/modules/gui_interface/RegistrationForm.class deleted file mode 100644 index 8f3508e..0000000 Binary files a/out/production/NewProject/modules/gui_interface/RegistrationForm.class and /dev/null differ diff --git a/out/production/NewProject/modules/gui_interface/SearchWindow$1.class b/out/production/NewProject/modules/gui_interface/SearchWindow$1.class deleted file mode 100644 index 1924cc7..0000000 Binary files a/out/production/NewProject/modules/gui_interface/SearchWindow$1.class and /dev/null differ diff --git a/out/production/NewProject/modules/gui_interface/SearchWindow$2.class b/out/production/NewProject/modules/gui_interface/SearchWindow$2.class deleted file mode 100644 index 24a8b9c..0000000 Binary files a/out/production/NewProject/modules/gui_interface/SearchWindow$2.class and /dev/null differ diff --git a/out/production/NewProject/modules/gui_interface/SearchWindow$3.class b/out/production/NewProject/modules/gui_interface/SearchWindow$3.class deleted file mode 100644 index 83d9f5d..0000000 Binary files a/out/production/NewProject/modules/gui_interface/SearchWindow$3.class and /dev/null differ diff --git a/out/production/NewProject/modules/gui_interface/SearchWindow.class b/out/production/NewProject/modules/gui_interface/SearchWindow.class deleted file mode 100644 index a53a436..0000000 Binary files a/out/production/NewProject/modules/gui_interface/SearchWindow.class and /dev/null differ diff --git a/out/production/NewProject/modules/gui_interface/TraditionalTableModel.class b/out/production/NewProject/modules/gui_interface/TraditionalTableModel.class deleted file mode 100644 index 9aeb7aa..0000000 Binary files a/out/production/NewProject/modules/gui_interface/TraditionalTableModel.class and /dev/null differ diff --git a/out/production/NewProject/modules/user_interface/AddHandler.class b/out/production/NewProject/modules/user_interface/AddHandler.class deleted file mode 100644 index 67530f5..0000000 Binary files a/out/production/NewProject/modules/user_interface/AddHandler.class and /dev/null differ diff --git a/out/production/NewProject/modules/user_interface/ChangeHandler.class b/out/production/NewProject/modules/user_interface/ChangeHandler.class deleted file mode 100644 index cc3625f..0000000 Binary files a/out/production/NewProject/modules/user_interface/ChangeHandler.class and /dev/null differ diff --git a/out/production/NewProject/modules/user_interface/MainMenu.class b/out/production/NewProject/modules/user_interface/MainMenu.class deleted file mode 100644 index 66d74af..0000000 Binary files a/out/production/NewProject/modules/user_interface/MainMenu.class and /dev/null differ diff --git a/out/production/NewProject/modules/user_interface/PrintHandler.class b/out/production/NewProject/modules/user_interface/PrintHandler.class deleted file mode 100644 index 1c207bc..0000000 Binary files a/out/production/NewProject/modules/user_interface/PrintHandler.class and /dev/null differ diff --git a/out/production/NewProject/modules/user_interface/RemoveHandler.class b/out/production/NewProject/modules/user_interface/RemoveHandler.class deleted file mode 100644 index 0c7d1e9..0000000 Binary files a/out/production/NewProject/modules/user_interface/RemoveHandler.class and /dev/null differ diff --git a/out/production/NewProject/modules/user_interface/SearchHandler.class b/out/production/NewProject/modules/user_interface/SearchHandler.class deleted file mode 100644 index a0bb403..0000000 Binary files a/out/production/NewProject/modules/user_interface/SearchHandler.class and /dev/null differ diff --git a/out/production/NewProject/modules/user_interface/TraditionHandler.class b/out/production/NewProject/modules/user_interface/TraditionHandler.class deleted file mode 100644 index ff31c84..0000000 Binary files a/out/production/NewProject/modules/user_interface/TraditionHandler.class and /dev/null differ diff --git a/out/production/NewProject/modules/user_interface/UserHandler.class b/out/production/NewProject/modules/user_interface/UserHandler.class deleted file mode 100644 index d1071a9..0000000 Binary files a/out/production/NewProject/modules/user_interface/UserHandler.class and /dev/null differ diff --git a/out/production/functions/functional/Registration.class b/out/production/functions/functional/Registration.class index 0e51678..fb5cbfb 100644 Binary files a/out/production/functions/functional/Registration.class and b/out/production/functions/functional/Registration.class differ diff --git a/out/production/functions/functional/Remove.class b/out/production/functions/functional/Remove.class index 1792890..0c5f456 100644 Binary files a/out/production/functions/functional/Remove.class and b/out/production/functions/functional/Remove.class differ diff --git a/out/production/functions/functional/Search.class b/out/production/functions/functional/Search.class index f617cb6..54e7347 100644 Binary files a/out/production/functions/functional/Search.class and b/out/production/functions/functional/Search.class differ diff --git a/out/production/functions/functional/UserData.class b/out/production/functions/functional/UserData.class index a16bbba..bc0b6cf 100644 Binary files a/out/production/functions/functional/UserData.class and b/out/production/functions/functional/UserData.class differ diff --git a/out/production/functions/functional/XmlFileWorking.class b/out/production/functions/functional/XmlFileWorking.class index 1ac3c82..9a63e4c 100644 Binary files a/out/production/functions/functional/XmlFileWorking.class and b/out/production/functions/functional/XmlFileWorking.class differ diff --git a/out/production/language/lang/Language.class b/out/production/language/lang/Language.class index c66d724..11aaee7 100644 Binary files a/out/production/language/lang/Language.class and b/out/production/language/lang/Language.class differ diff --git a/out/production/language/lang/Strings_EN.class b/out/production/language/lang/Strings_EN.class index d06c4b2..40e2ab0 100644 Binary files a/out/production/language/lang/Strings_EN.class and b/out/production/language/lang/Strings_EN.class differ diff --git a/out/production/language/lang/Strings_RU.class b/out/production/language/lang/Strings_RU.class index 888c125..065a66f 100644 Binary files a/out/production/language/lang/Strings_RU.class and b/out/production/language/lang/Strings_RU.class differ diff --git a/out/production/server/user_interface/ChangeHandler.class b/out/production/server/user_interface/ChangeHandler.class index 3409109..368c441 100644 Binary files a/out/production/server/user_interface/ChangeHandler.class and b/out/production/server/user_interface/ChangeHandler.class differ diff --git a/out/production/server/user_interface/PrintHandler.class b/out/production/server/user_interface/PrintHandler.class index 4a07f61..50fb285 100644 Binary files a/out/production/server/user_interface/PrintHandler.class and b/out/production/server/user_interface/PrintHandler.class differ diff --git a/out/production/server/user_interface/RemoveHandler.class b/out/production/server/user_interface/RemoveHandler.class index 378d57e..493437a 100644 Binary files a/out/production/server/user_interface/RemoveHandler.class and b/out/production/server/user_interface/RemoveHandler.class differ diff --git a/out/production/server/user_interface/UserHandler.class b/out/production/server/user_interface/UserHandler.class index 1e3b05d..08471d6 100644 Binary files a/out/production/server/user_interface/UserHandler.class and b/out/production/server/user_interface/UserHandler.class differ diff --git a/out/production/server/user_interface/myServer.class b/out/production/server/user_interface/myServer.class index 9e4f95e..36ccdf3 100644 Binary files a/out/production/server/user_interface/myServer.class and b/out/production/server/user_interface/myServer.class differ diff --git a/resources/temp/Mihtemp.xml b/resources/temp/Mihtemp.xml index db9983f..e69de29 100644 --- a/resources/temp/Mihtemp.xml +++ b/resources/temp/Mihtemp.xml @@ -1 +0,0 @@ -День мафии15.04PERSONALИталия \ No newline at end of file diff --git a/resources/temp/Vallytemp.xml b/resources/temp/Vallytemp.xml index 3faea0f..e69de29 100644 --- a/resources/temp/Vallytemp.xml +++ b/resources/temp/Vallytemp.xml @@ -1 +0,0 @@ -День лягушек22.04PROFESSIONALФранцияДень родео24.04NATIVEИспанияФиеста17.04PROFESSIONALИспанияДень рождения Лионель Месси26.04RELIGIONАргентинаКарнавал Месси17.04PROFESSIONALАргентинаДень страны15.04NATIVEФранцияДень страны15.04NATIVEИспания8 Марта10.03NATIVEФранция \ No newline at end of file diff --git a/serverLog.txt b/serverLog.txt index cb5d1cb..a2d2fe4 100644 --- a/serverLog.txt +++ b/serverLog.txt @@ -649,3 +649,12 @@ Session started: Sun Apr 26 12:19:47 BRT 2015 Client Vally connected Sun Apr 26 12:19:49 BRT 2015 Client Vally connected Sun Apr 26 12:19:58 BRT 2015 Session started: Sun Apr 26 15:18:02 BRT 2015 + +Session started: Mon Apr 27 10:12:04 SAMT 2015 + + Client Vally connected Mon Apr 27 10:12:26 SAMT 2015 +Session started: Mon Apr 27 10:16:37 SAMT 2015 + +Session started: Mon Apr 27 10:16:44 SAMT 2015 + + Client Vally connected Mon Apr 27 10:17:04 SAMT 2015 \ No newline at end of file