добавил поле типа
This commit is contained in:
3
.idea/workspace.xml
generated
3
.idea/workspace.xml
generated
@@ -8,7 +8,10 @@
|
|||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
|
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/DBProjectFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/DBProjectFile.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Message.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Message.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Message.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Message.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/db_project_info.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/db_project_info.java" afterDir="false" />
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
"ServerUserPassword": "mprit_2011",
|
"ServerUserPassword": "mprit_2011",
|
||||||
"OfferRegistrationOnStart": true,
|
"OfferRegistrationOnStart": true,
|
||||||
"Workspace": "E:\\Tests",
|
"Workspace": "E:\\Tests",
|
||||||
"ProjectsSearchDirectory": "E:\\SAPFOR\\Tests",
|
"ProjectsSearchDirectory": "E:\\BUG",
|
||||||
"DocumentsDirectory": "C:\\Users\\misha\\Documents\\_testing_system",
|
"DocumentsDirectory": "C:\\Users\\misha\\Documents\\_testing_system",
|
||||||
"VisualiserPath": "C:\\Users\\misha\\Downloads",
|
"VisualiserPath": "C:\\Users\\misha\\Downloads",
|
||||||
"Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
|
"Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
|
||||||
|
|||||||
@@ -257,6 +257,13 @@ public class DBProjectFile extends ProjectFile {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/*
|
||||||
|
public void AddNewMessage(Message message){
|
||||||
|
switch (message.)
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
public DefaultMutableTreeNode show_loop_graph_r(FileObjectWithMessages element) {
|
public DefaultMutableTreeNode show_loop_graph_r(FileObjectWithMessages element) {
|
||||||
DefaultMutableTreeNode res = new DefaultMutableTreeNode(element);
|
DefaultMutableTreeNode res = new DefaultMutableTreeNode(element);
|
||||||
if (element instanceof Loop) {
|
if (element instanceof Loop) {
|
||||||
|
|||||||
@@ -20,6 +20,9 @@ public class Message extends iDBObject {
|
|||||||
public int group;
|
public int group;
|
||||||
@Expose
|
@Expose
|
||||||
public String value;
|
public String value;
|
||||||
|
@Expose
|
||||||
|
@Description("IGNORE")
|
||||||
|
public int type;
|
||||||
//--
|
//--
|
||||||
@Description("DEFAULT ''")
|
@Description("DEFAULT ''")
|
||||||
public String file = "";
|
public String file = "";
|
||||||
|
|||||||
@@ -19,6 +19,8 @@ import _VisualDVM.ProjectData.Files.FileType;
|
|||||||
import _VisualDVM.ProjectData.Files.LanguageStyle;
|
import _VisualDVM.ProjectData.Files.LanguageStyle;
|
||||||
import _VisualDVM.ProjectData.LanguageName;
|
import _VisualDVM.ProjectData.LanguageName;
|
||||||
import _VisualDVM.ProjectData.Messages.Errors.MessageError;
|
import _VisualDVM.ProjectData.Messages.Errors.MessageError;
|
||||||
|
import _VisualDVM.ProjectData.Messages.FileMessagesJson;
|
||||||
|
import _VisualDVM.ProjectData.Messages.MessagesJson;
|
||||||
import _VisualDVM.ProjectData.Messages.Notes.MessageNote;
|
import _VisualDVM.ProjectData.Messages.Notes.MessageNote;
|
||||||
import _VisualDVM.ProjectData.Messages.Recommendations.MessageRecommendation;
|
import _VisualDVM.ProjectData.Messages.Recommendations.MessageRecommendation;
|
||||||
import _VisualDVM.ProjectData.Messages.Warnings.MessageWarning;
|
import _VisualDVM.ProjectData.Messages.Warnings.MessageWarning;
|
||||||
@@ -1138,6 +1140,15 @@ public class db_project_info extends DBObject {
|
|||||||
}
|
}
|
||||||
///------------------------------------------------------------------------------------------->>>>>
|
///------------------------------------------------------------------------------------------->>>>>
|
||||||
public void unpackMessagesAndLog(String packed_messages, String log_in) throws Exception {
|
public void unpackMessagesAndLog(String packed_messages, String log_in) throws Exception {
|
||||||
|
System.out.println("packed_mesages="+packed_messages);
|
||||||
|
MessagesJson messages = Utils_.gson.fromJson(packed_messages, MessagesJson.class);
|
||||||
|
for (FileMessagesJson fileMessages: messages.allMessages){
|
||||||
|
fileMessages.file=Utils_.toW(fileMessages.file);
|
||||||
|
//--
|
||||||
|
DBProjectFile messageFile = db.files.Data.get(fileMessages.file);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
if (packed_messages.length() > 0) {
|
if (packed_messages.length() > 0) {
|
||||||
int idx = 0;
|
int idx = 0;
|
||||||
String[] splited = packed_messages.split("\\|");
|
String[] splited = packed_messages.split("\\|");
|
||||||
|
|||||||
Reference in New Issue
Block a user