патч на применение настроек старых баг репортов
This commit is contained in:
@@ -3,7 +3,9 @@ import Common.Database.Objects.DBObject;
|
||||
import Common.Database.Objects.rDBObject;
|
||||
import Common.Utils.TextLog;
|
||||
import Common.Utils.Utils_;
|
||||
import Common.Utils.Vector_;
|
||||
import _VisualDVM.Global;
|
||||
import _VisualDVM.ProjectData.SapforData.SapforProperties;
|
||||
import _VisualDVM.Repository.BugReport.Json.RecipientJson;
|
||||
import _VisualDVM.Repository.BugReport.Json.RecipientsJson;
|
||||
import _VisualDVM.Repository.BugReport.Json.VisualiserSettingsJson;
|
||||
@@ -25,7 +27,7 @@ public class BugReport extends rDBObject {
|
||||
@Description("DEFAULT ''")
|
||||
public String packedRecipientsJson = "";
|
||||
@Description("DEFAULT ''")
|
||||
public String packedSettingsJson = "";
|
||||
public String packedSettingsJson = ""; //устарело. (?)
|
||||
public String executor = "";
|
||||
@Description("DEFAULT ''")
|
||||
public String executor_address = "";
|
||||
@@ -50,7 +52,7 @@ public class BugReport extends rDBObject {
|
||||
project_version = version_in;
|
||||
visualiser_version = ComponentsSet.visualiser.version;
|
||||
sapfor_version = Global.components.get(ComponentType.Sapfor_F).version;
|
||||
packedSettingsJson = ""; //Utils_.gson.toJson(Global.mainModule.getDb().settings.getSapforSettingsJson());
|
||||
packedSettingsJson = Utils_.gson.toJson(Global.mainModule.getProject().sapforProperties);
|
||||
percentage = 0;
|
||||
description = description_in;
|
||||
date = new Date().getTime();
|
||||
@@ -90,7 +92,6 @@ public class BugReport extends rDBObject {
|
||||
return (data.length > 0) ? data[0] : "";
|
||||
} else return "";
|
||||
}
|
||||
|
||||
public boolean CheckNotDraft(TextLog log) {
|
||||
if (state.equals(BugReportState.draft)) {
|
||||
log.Writeln_("Отчёт об ошибке является черновиком");
|
||||
@@ -123,11 +124,22 @@ public class BugReport extends rDBObject {
|
||||
return res;
|
||||
}
|
||||
public String getSettingsSummary() {
|
||||
return
|
||||
(Global.mainModule.HasAccount() ? (Global.mainModule.getAccount().isAdmin() ? ("Адрес отправителя: " + sender_address + "\n") : "") : "") +
|
||||
"Версия SAPFOR: " + sapfor_version + "\n" +
|
||||
"Версия визуализатора: " + visualiser_version + "\n" +
|
||||
"----------------------------------\n" + getSettingsJson().getSummary();
|
||||
Vector<String> res = new Vector_<String>(
|
||||
(Global.mainModule.HasAccount() ? (Global.mainModule.getAccount().isAdmin() ? ("Адрес отправителя: " + sender_address + "\n") : "") : ""),
|
||||
"Версия SAPFOR: " + sapfor_version,
|
||||
"Версия визуализатора: " + visualiser_version,
|
||||
"----------------------------------"
|
||||
);
|
||||
if (!project_version.isEmpty()) {
|
||||
if (visualiser_version < 1134) {
|
||||
System.out.println("old bug");
|
||||
res.add(getSettingsJson().getSummary());
|
||||
} else {
|
||||
System.out.println("new bug");
|
||||
res.add(getPropertiesJson().getSummary());
|
||||
}
|
||||
}
|
||||
return String.join("\n", res);
|
||||
}
|
||||
public String getPassport() {
|
||||
return String.join("\n",
|
||||
@@ -162,43 +174,7 @@ public class BugReport extends rDBObject {
|
||||
public VisualiserSettingsJson getSettingsJson(){
|
||||
return packedSettingsJson.isEmpty()? new VisualiserSettingsJson(): Utils_.gson.fromJson(packedSettingsJson,VisualiserSettingsJson.class);
|
||||
}
|
||||
/*
|
||||
public void settingsPatch(){
|
||||
// System.out.println(getPK());
|
||||
// if (packedSettingsJson.isEmpty()) {
|
||||
//System.out.println(sapfor_settings);
|
||||
//--
|
||||
VisualiserSettingsJson settings = new VisualiserSettingsJson();
|
||||
String[] lines = sapfor_settings.split("\n");
|
||||
for (int i = 1; i < lines.length; ++i) {
|
||||
String line = lines[i];
|
||||
if (!line.toLowerCase().contains("настройки")) {
|
||||
line = line.replace(" :", "=").replace("True","1").replace("False","0").trim();
|
||||
SettingName settingName = null;
|
||||
try {
|
||||
settingName = SettingName.valueOf(line.substring(0, line.indexOf('=')));
|
||||
} catch (Exception ex) {
|
||||
System.out.println(line);
|
||||
}
|
||||
if (settingName == null) {
|
||||
try {
|
||||
settingName = SettingName.getByDescription(line.substring(0, line.indexOf('=')));
|
||||
} catch (Exception ex) {
|
||||
System.out.println(line);
|
||||
}
|
||||
}
|
||||
if (settingName != null) {
|
||||
String settingValue = line.substring(line.indexOf('=') + 1);
|
||||
if (!settingName.equals(SettingName.Undefined)) {
|
||||
VisualiserSettingJson setting = new VisualiserSettingJson();
|
||||
setting.name = settingName.toString();
|
||||
setting.value = settingValue;
|
||||
settings.array.add(setting);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
packedSettingsJson = Utils_.gson.toJson(settings);
|
||||
}
|
||||
*/
|
||||
public SapforProperties getPropertiesJson(){
|
||||
return packedSettingsJson.isEmpty()? new SapforProperties(): Utils_.gson.fromJson(packedSettingsJson,SapforProperties.class);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,10 +7,4 @@ public class VisualiserSettingJson {
|
||||
public String value;
|
||||
public VisualiserSettingJson(){
|
||||
}
|
||||
/*
|
||||
public VisualiserSettingJson(DBSetting dbSetting){
|
||||
name = dbSetting.Name.toString();
|
||||
value = dbSetting.Value;
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
package _VisualDVM.Repository.BugReport.Json;
|
||||
import _VisualDVM.ProjectData.SapforData.SapforProperties;
|
||||
import com.google.gson.annotations.Expose;
|
||||
|
||||
import java.util.List;
|
||||
@@ -6,18 +7,16 @@ import java.util.Vector;
|
||||
public class VisualiserSettingsJson {
|
||||
@Expose
|
||||
public List<VisualiserSettingJson> array = new Vector<>();
|
||||
public String getSummary(){
|
||||
Vector<String> res=new Vector<>();
|
||||
/*
|
||||
for (VisualiserSettingJson setting: array){
|
||||
public String getSummary() {
|
||||
SapforProperties properties = new SapforProperties(); //только для извлечения описаний.
|
||||
Vector<String> res = new Vector<>();
|
||||
for (VisualiserSettingJson setting : array) {
|
||||
try {
|
||||
res.add(SettingName.valueOf(setting.name).getDescription() + "=" + setting.value);
|
||||
}
|
||||
catch (Exception ex){
|
||||
res.add(properties.getFieldDescription(setting.name) + "=" + setting.value);
|
||||
} catch (Exception ex) {
|
||||
ex.printStackTrace();
|
||||
}
|
||||
}
|
||||
*/
|
||||
return String.join("\n",res);
|
||||
return String.join("\n", res);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -60,7 +60,7 @@ public class Visualiser extends Component {
|
||||
//http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
|
||||
@Override
|
||||
public void GetVersionInfo() {
|
||||
version = 1133;
|
||||
version = 1134;
|
||||
String pattern = "MMM dd yyyy HH:mm:ss";
|
||||
DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
|
||||
date_text = df.format(getClassBuildTime());
|
||||
|
||||
Reference in New Issue
Block a user