mirror/Jailer
1
0
Fork 0
mirror of https://github.com/Wisser/Jailer.git synced 2026-05-16 19:38:39 -05:00
Code Issues Packages Projects Releases 105 Wiki Activity

removed obsolete code

Browse Source
This commit is contained in:
Ralf Wisser
2019-05-20 10:17:37 +02:00
parent d608eb4d58
commit f65962cc5a
10 changed files with 32 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/gui/net/sf/jailer/ui/AdditionalSubjectsDialog.java
+2 -2
View File
@@ -197,8 +197,8 @@ public class AdditionalSubjectsDialog extends javax.swing.JDialog {
}
String cond = conditionEditor.edit(detailsCondtition.getText(), "Subject", "T", table, null, null, null, false, true);
if (cond != null) {
if (!detailsCondtition.getText().equals(ConditionEditor.toSingleLine(cond))) {
detailsCondtition.setText(ConditionEditor.toSingleLine(cond));
if (!detailsCondtition.getText().equals((cond))) {
detailsCondtition.setText((cond));
}
detailsLabel.setIcon(conditionEditorIcon);
}
src/main/gui/net/sf/jailer/ui/ConditionEditor.java
-52
View File
@@ -421,7 +421,6 @@ public class ConditionEditor extends EscapableDialog {
* @return new condition or <code>null</code>, if user canceled the editor
*/
public String edit(String condition, String table1label, String table1alias, Table table1, String table2label, String table2alias, Table table2, boolean addPseudoColumns, boolean addConvertSubqueryButton) {
condition = toMultiLine(condition);
if (Pattern.compile("\\bselect\\b", Pattern.CASE_INSENSITIVE|Pattern.DOTALL).matcher(condition).find()) {
condition = new BasicFormatterImpl().format(condition);
}
@@ -545,57 +544,6 @@ public class ConditionEditor extends EscapableDialog {
}
}
/**
* Converts multi-line text into single line presentation.
*/
public static String toSingleLine(String s) {
return s;
// TODO this doesn't seem to work
// StringBuilder sb = new StringBuilder();
// for (int i = 0; i < s.length(); ++i) {
// char c = s.charAt(i);
// if (c == '\\') {
// sb.append("\\\\");
// } else if (c == '\n') {
// sb.append("\\n");
// } else if (c == '\r') {
// sb.append("\\r");
// } else {
// sb.append(c);
// }
// }
// return sb.toString();
}
/**
* Converts single line presentation into multi-line text.
*/
public static String toMultiLine(String s) {
return s;
// TODO this doesn't seem to work
// StringBuilder sb = new StringBuilder();
// boolean esc = false;
// for (int i = 0; i < s.length(); ++i) {
// char c = s.charAt(i);
// if (c == '\\') {
// if (esc) {
// esc = false;
// } else {
// esc = true;
// continue;
// }
// }
// if (esc && c == 'n') {
// c = '\n';
// } else if (esc && c == 'r') {
// c = '\r';
// }
// sb.append(c);
// esc = false;
// }
// return sb.toString();
}
// Variables declaration - do not modify//GEN-BEGIN:variables
public javax.swing.JPanel addOnPanel;
private javax.swing.JButton cancelButton;
src/main/gui/net/sf/jailer/ui/ExportDialog.java
+5 -5
View File
@@ -368,9 +368,9 @@ public class ExportDialog extends javax.swing.JDialog {
subjectTable.setText(subject.getName());
if (subjectCondition.equals(previousInitialSubjectCondition)) {
where.setText(ConditionEditor.toSingleLine(previousSubjectCondition));
where.setText((previousSubjectCondition));
} else {
where.setText(ConditionEditor.toSingleLine(subjectCondition));
where.setText((subjectCondition));
}
browseInsertButton.setIcon(loadIcon);
@@ -439,8 +439,8 @@ public class ExportDialog extends javax.swing.JDialog {
public void mouseClicked(java.awt.event.MouseEvent evt) {
String cond = subjectConditionEditor.edit(where.getText(), "Subject", "T", subject, null, null, null, false, true);
if (cond != null) {
if (!where.getText().equals(ConditionEditor.toSingleLine(cond))) {
where.setText(ConditionEditor.toSingleLine(cond));
if (!where.getText().equals((cond))) {
where.setText((cond));
}
openWhereEditor.setIcon(conditionEditorSelectedIcon);
}
@@ -2070,7 +2070,7 @@ public class ExportDialog extends javax.swing.JDialog {
if (!where.getText().equals(subjectCondition)) {
args.add("-where");
args.add(ConditionEditor.toMultiLine(where.getText()).replace('\n', ' ').replace('\r', ' '));
args.add((where.getText()).replace('\n', ' ').replace('\r', ' '));
}
args.add("-format");
src/main/gui/net/sf/jailer/ui/ExtractionModelEditor.java
+9 -9
View File
@@ -680,7 +680,7 @@ public class ExtractionModelEditor extends javax.swing.JPanel {
if (cond.equals("1=1")) {
cond = "";
}
condition.setText(ConditionEditor.toSingleLine(cond));
condition.setText((cond));
condition.addKeyListener(new KeyListener() {
@Override
public void keyPressed(KeyEvent arg0) {
@@ -761,8 +761,8 @@ public class ExtractionModelEditor extends javax.swing.JPanel {
@Override
protected void consume(String cond) {
if (cond != null) {
if (!condition.getText().equals(NonModalConditionEditor.toSingleLine(cond))) {
condition.setText(NonModalConditionEditor.toSingleLine(cond));
if (!condition.getText().equals((cond))) {
condition.setText((cond));
needsSave = true;
ExtractionModelEditor.this.extractionModelFrame.updateTitle(needsSave);
}
@@ -774,8 +774,8 @@ public class ExtractionModelEditor extends javax.swing.JPanel {
@Override
protected void consume(String cond) {
if (cond != null) {
if (!restrictionEditor.restriction.getText().equals(NonModalConditionEditor.toSingleLine(cond))) {
restrictionEditor.restriction.setText(NonModalConditionEditor.toSingleLine(cond));
if (!restrictionEditor.restriction.getText().equals((cond))) {
restrictionEditor.restriction.setText((cond));
onApply(true);
}
}
@@ -1007,7 +1007,7 @@ public class ExtractionModelEditor extends javax.swing.JPanel {
* @return current subject condition
*/
public String getSubjectCondition() {
return ConditionEditor.toMultiLine(condition.getText());
return (condition.getText());
}
/**
@@ -1964,7 +1964,7 @@ public class ExtractionModelEditor extends javax.swing.JPanel {
restrictionCondition = restrictionCondition.substring(1, restrictionCondition.length() - 1);
}
initialRestrictionCondition = association.isIgnored()? null : restrictionCondition;
restrictionEditor.restriction.setText(restrictionCondition == null? "" : ConditionEditor.toSingleLine(restrictionCondition));
restrictionEditor.restriction.setText(restrictionCondition == null? "" : (restrictionCondition));
if (association.isIgnored()) {
restrictionEditor.ignore.getModel().setSelected(true);
} else {
@@ -2047,7 +2047,7 @@ public class ExtractionModelEditor extends javax.swing.JPanel {
condition = "";
}
} else {
condition = ConditionEditor.toMultiLine(restrictionEditor.restriction.getText()).trim();
condition = (restrictionEditor.restriction.getText()).trim();
}
}
addRestriction(currentAssociation.source, currentAssociation, condition, true);
@@ -2713,7 +2713,7 @@ public class ExtractionModelEditor extends javax.swing.JPanel {
return true;
}
String currentModelSubfolder = DataModelManager.getCurrentModelSubfolder(executionContext);
dataModel.save(fileName, stable, ConditionEditor.toMultiLine(condition.getText()), scriptFormat, currentRestrictionDefinitions, null, extractionModel.additionalSubjects, currentModelSubfolder);
dataModel.save(fileName, stable, (condition.getText()), scriptFormat, currentRestrictionDefinitions, null, extractionModel.additionalSubjects, currentModelSubfolder);
} catch (Exception e) {
UIUtil.showException(this, "Could not save " + new File(fileName).getName(), e);
return false;
src/main/gui/net/sf/jailer/ui/FilterEditorDialog.java
+7 -7
View File
@@ -543,8 +543,8 @@ public class FilterEditorDialog extends javax.swing.JDialog {
conditionEditor.setTitle(templateDetailsNameField.getText().trim());
String cond = conditionEditor.edit(templateDetailsNewValueField.getText(), null, null, null, null, null, null, false, templatesDetailsApplyAtComboBox.getSelectedIndex() == 0);
if (cond != null) {
if (!templateDetailsNewValueField.getText().equals(ConditionEditor.toSingleLine(cond))) {
templateDetailsNewValueField.setText(ConditionEditor.toSingleLine(cond));
if (!templateDetailsNewValueField.getText().equals((cond))) {
templateDetailsNewValueField.setText((cond));
}
templatesDetailsMulitlineLabel.setIcon(conditionEditorIcon);
}
@@ -957,7 +957,7 @@ public class FilterEditorDialog extends javax.swing.JDialog {
}
final javax.swing.JTextField textField = new javax.swing.JTextField();
final String initialExpr = filter == null? (c.getFilter() == null? Filter.OLD_VALUE_PROP : ConditionEditor.toSingleLine(c.getFilter().getExpression())) : ConditionEditor.toSingleLine(filter);
final String initialExpr = filter == null? (c.getFilter() == null? Filter.OLD_VALUE_PROP : (c.getFilter().getExpression())) : (filter);
final boolean hasFilter = c.getFilter() != null;
final boolean hasDerivedFilter = c.getFilter() != null && c.getFilter().isDerived();
final boolean finalIsPk = isPK;
@@ -1092,8 +1092,8 @@ public class FilterEditorDialog extends javax.swing.JDialog {
conditionEditor.setTitle(columnName.trim());
String cond = conditionEditor.edit(textField.getText(), "Table", "T", table, null, null, null, false, applyAtCB.getSelectedIndex() == 0);
if (cond != null) {
if (!textField.getText().equals(ConditionEditor.toSingleLine(cond))) {
textField.setText(ConditionEditor.toSingleLine(cond));
if (!textField.getText().equals((cond))) {
textField.setText((cond));
}
theLabel.setIcon(conditionEditorIcon);
}
@@ -1258,7 +1258,7 @@ public class FilterEditorDialog extends javax.swing.JDialog {
*/
private void storeFilterExpressions() {
for (Column c: filterTextfieldsPerColumn.keySet()) {
String newFilter = ConditionEditor.toMultiLine(filterTextfieldsPerColumn.get(c).getText()).trim();
String newFilter = (filterTextfieldsPerColumn.get(c).getText()).trim();
boolean hasDerivedFilter = c.getFilter() != null && c.getFilter().isDerived();
if (hasDerivedFilter && newFilter.length() == 0) {
newFilter = Filter.OLD_VALUE_PROP;
@@ -1294,7 +1294,7 @@ public class FilterEditorDialog extends javax.swing.JDialog {
*/
private boolean needsSave() {
for (Column c: filterTextfieldsPerColumn.keySet()) {
String newFilter = ConditionEditor.toMultiLine(filterTextfieldsPerColumn.get(c).getText()).trim();
String newFilter = (filterTextfieldsPerColumn.get(c).getText()).trim();
boolean hasDerivedFilter = c.getFilter() != null && c.getFilter().isDerived();
if (hasDerivedFilter && newFilter.length() == 0) {
newFilter = Filter.OLD_VALUE_PROP;
src/main/gui/net/sf/jailer/ui/NonModalConditionEditor.java
-52
View File
@@ -491,7 +491,6 @@ public abstract class NonModalConditionEditor extends EscapableDialog {
* @return new condition or <code>null</code>, if user canceled the editor
*/
public void edit(JComponent locator, String condition, String table1label, String table1alias, Table table1, String table2label, String table2alias, Table table2, boolean addPseudoColumns, boolean addConvertSubqueryButton) {
condition = toMultiLine(condition);
if (Pattern.compile("\\bselect\\b", Pattern.CASE_INSENSITIVE|Pattern.DOTALL).matcher(condition).find()) {
condition = new BasicFormatterImpl().format(condition);
}
@@ -620,57 +619,6 @@ public abstract class NonModalConditionEditor extends EscapableDialog {
}
}
/**
* Converts multi-line text into single line presentation.
*/
public static String toSingleLine(String s) {
return s;
// TODO this doesn't seem to work
// StringBuilder sb = new StringBuilder();
// for (int i = 0; i < s.length(); ++i) {
// char c = s.charAt(i);
// if (c == '\\') {
// sb.append("\\\\");
// } else if (c == '\n') {
// sb.append("\\n");
// } else if (c == '\r') {
// sb.append("\\r");
// } else {
// sb.append(c);
// }
// }
// return sb.toString();
}
/**
* Converts single line presentation into multi-line text.
*/
public static String toMultiLine(String s) {
return s;
// TODO this doesn't seem to work
// StringBuilder sb = new StringBuilder();
// boolean esc = false;
// for (int i = 0; i < s.length(); ++i) {
// char c = s.charAt(i);
// if (c == '\\') {
// if (esc) {
// esc = false;
// } else {
// esc = true;
// continue;
// }
// }
// if (esc && c == 'n') {
// c = '\n';
// } else if (esc && c == 'r') {
// c = '\r';
// }
// sb.append(c);
// esc = false;
// }
// return sb.toString();
}
// Variables declaration - do not modify//GEN-BEGIN:variables
protected javax.swing.JPanel addOnPanel;
private javax.swing.JButton cancelButton;
src/main/gui/net/sf/jailer/ui/databrowser/BrowserContentPane.java
+6 -7
View File
@@ -143,7 +143,6 @@ import net.sf.jailer.extractionmodel.ExtractionModel;
import net.sf.jailer.modelbuilder.JDBCMetaDataBasedModelElementFinder;
import net.sf.jailer.modelbuilder.MemorizedResultSet.MemorizedResultSetMetaData;
import net.sf.jailer.subsetting.ScriptFormat;
import net.sf.jailer.ui.ConditionEditor;
import net.sf.jailer.ui.DataModelManager;
import net.sf.jailer.ui.DbConnectionDialog;
import net.sf.jailer.ui.Environment;
@@ -670,7 +669,7 @@ public abstract class BrowserContentPane extends javax.swing.JPanel {
Component render = acRenderer.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
if (render instanceof JLabel) {
if (value != null && value.toString().trim().length() > 0) {
String tooltip = ConditionEditor.toMultiLine(value.toString());
String tooltip = (value.toString());
((JLabel) render).setToolTipText(UIUtil.toHTML(tooltip, 200));
} else {
((JLabel) render).setToolTipText(null);
@@ -699,7 +698,7 @@ public abstract class BrowserContentPane extends javax.swing.JPanel {
JTextField f = ((JTextField) andCondition.getEditor().getEditorComponent());
String value = f.getText();
if (value != null && value.toString().trim().length() > 0) {
String tooltip = ConditionEditor.toMultiLine(value.toString());
String tooltip = (value.toString());
andCondition.setToolTipText(UIUtil.toHTML(tooltip, 200));
} else {
andCondition.setToolTipText(null);
@@ -837,7 +836,7 @@ public abstract class BrowserContentPane extends javax.swing.JPanel {
rowsTableScrollPane.setViewportView(rowsTable);
rowsTable.setAutoscrolls(false);
setAndCondition(ConditionEditor.toSingleLine(condition), true);
setAndCondition((condition), true);
from.setText(table == null? "" : this.dataModel.getDisplayName(table));
adjustGui();
rowsTable.setShowGrid(false);
@@ -1088,8 +1087,8 @@ public abstract class BrowserContentPane extends javax.swing.JPanel {
@Override
protected void consume(String cond) {
if (cond != null) {
if (!getAndConditionText().equals(ConditionEditor.toSingleLine(cond))) {
setAndCondition(ConditionEditor.toSingleLine(cond), true);
if (!getAndConditionText().equals((cond))) {
setAndCondition((cond), true);
loadButton.grabFocus();
reloadRows();
}
@@ -3315,7 +3314,7 @@ public abstract class BrowserContentPane extends javax.swing.JPanel {
whereExists = true;
}
if (andCond.trim().length() > 0) {
sql += (whereExists ? " and" : " Where") + " (" + ConditionEditor.toMultiLine(andCond) + ")";
sql += (whereExists ? " and" : " Where") + " (" + (andCond) + ")";
}
olapPrefix += " From (";
if (useOLAPLimitation) {
src/main/gui/net/sf/jailer/ui/databrowser/DBConditionEditor.java
-52
View File
@@ -380,7 +380,6 @@ public abstract class DBConditionEditor extends EscapableDialog {
* @return new condition or <code>null</code>, if user canceled the editor
*/
public void edit(String condition, String table1label, String table1alias, Table table1, String table2label, String table2alias, Table table2, boolean addPseudoColumns, boolean addConvertSubqueryButton) {
condition = toMultiLine(condition);
if (Pattern.compile("\\bselect\\b", Pattern.CASE_INSENSITIVE|Pattern.DOTALL).matcher(condition).find()) {
condition = new BasicFormatterImpl().format(condition);
}
@@ -487,57 +486,6 @@ public abstract class DBConditionEditor extends EscapableDialog {
}
}
/**
* Converts multi-line text into single line presentation.
*/
public static String toSingleLine(String s) {
return s;
// TODO this doesn't seem to work
// StringBuilder sb = new StringBuilder();
// for (int i = 0; i < s.length(); ++i) {
// char c = s.charAt(i);
// if (c == '\\') {
// sb.append("\\\\");
// } else if (c == '\n') {
// sb.append("\\n");
// } else if (c == '\r') {
// sb.append("\\r");
// } else {
// sb.append(c);
// }
// }
// return sb.toString();
}
/**
* Converts single line presentation into multi-line text.
*/
public static String toMultiLine(String s) {
return s;
// TODO this doesn't seem to work
// StringBuilder sb = new StringBuilder();
// boolean esc = false;
// for (int i = 0; i < s.length(); ++i) {
// char c = s.charAt(i);
// if (c == '\\') {
// if (esc) {
// esc = false;
// } else {
// esc = true;
// continue;
// }
// }
// if (esc && c == 'n') {
// c = '\n';
// } else if (esc && c == 'r') {
// c = '\r';
// }
// sb.append(c);
// esc = false;
// }
// return sb.toString();
}
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JPanel gripPanel;
private javax.swing.JLabel jLabel2;
src/main/gui/net/sf/jailer/ui/databrowser/Desktop.java
+3 -4
View File
@@ -105,7 +105,6 @@ import net.sf.jailer.datamodel.Association;
import net.sf.jailer.datamodel.DataModel;
import net.sf.jailer.datamodel.Table;
import net.sf.jailer.modelbuilder.KnownIdentifierMap;
import net.sf.jailer.ui.ConditionEditor;
import net.sf.jailer.ui.DbConnectionDialog;
import net.sf.jailer.ui.Environment;
import net.sf.jailer.ui.QueryBuilderDialog;
@@ -778,7 +777,7 @@ public abstract class Desktop extends JDesktopPane {
@Override
protected QueryBuilderDialog.Relationship createQBRelations(boolean withParents) {
QueryBuilderDialog.Relationship root = new QueryBuilderDialog.Relationship();
root.whereClause = ConditionEditor.toMultiLine(getAndConditionText().trim()); // .replaceAll("(\r|\n)+", " ");
root.whereClause = (getAndConditionText().trim()); // .replaceAll("(\r|\n)+", " ");
if (root.whereClause.length() == 0) {
root.whereClause = null;
}
@@ -801,7 +800,7 @@ public abstract class Desktop extends JDesktopPane {
child.children.addAll(rb.browserContentPane.createQBChildrenRelations(childRB, false));
child.parent = r;
r.children.add(0, child);
child.whereClause = ConditionEditor.toMultiLine(rb.browserContentPane.getAndConditionText().trim()).replaceAll("(\r|\n)+", " ");
child.whereClause = (rb.browserContentPane.getAndConditionText().trim()).replaceAll("(\r|\n)+", " ");
if (child.whereClause.length() == 0) {
child.whereClause = null;
}
@@ -842,7 +841,7 @@ public abstract class Desktop extends JDesktopPane {
.size() == 1);
if (true) { // all || !singleRowParent) {
QueryBuilderDialog.Relationship child = new QueryBuilderDialog.Relationship();
child.whereClause = ConditionEditor.toMultiLine(rb.browserContentPane.getAndConditionText().trim()).replaceAll("(\r|\n)+", " ");
child.whereClause = (rb.browserContentPane.getAndConditionText().trim()).replaceAll("(\r|\n)+", " ");
child.joinOperator = QueryBuilderDialog.JoinOperator.LeftJoin;
if (child.whereClause.length() == 0) {
child.whereClause = null;
src/main/gui/net/sf/jailer/ui/util/SizeGrip.java
-2
View File
@@ -182,8 +182,6 @@ public class SizeGrip extends JPanel {
@Override
public void updateUI() {
super.updateUI();
// TODO: Key off of Aqua LaF, not just OS X, as this size grip looks
// bad on other LaFs on Mac such as Nimbus.
if (System.getProperty("os.name").contains("OS X")) {
if (osxSizeGrip==null) {
osxSizeGrip = createOSXSizeGrip();