Skip to content

Commit 9e15994

Browse files
author
source
committed
fix input to output
1 parent b1a90a3 commit 9e15994

File tree

11 files changed

+168
-165
lines changed

11 files changed

+168
-165
lines changed

release/YaguraExtender.jar

-59 Bytes
Binary file not shown.

src/yagura/view/JReplaceDialog.form

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,9 @@
112112
<EmptySpace pref="20" max="32767" attributes="0"/>
113113
</Group>
114114
<Group type="102" attributes="0">
115-
<EmptySpace min="37" pref="37" max="-2" attributes="0"/>
115+
<EmptySpace min="-2" pref="37" max="-2" attributes="0"/>
116116
<Component id="scrollPane" pref="0" max="32767" attributes="0"/>
117+
<EmptySpace max="-2" attributes="0"/>
117118
</Group>
118119
</Group>
119120
</DimensionLayout>

src/yagura/view/JReplaceDialog.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,8 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
227227
.addContainerGap(20, Short.MAX_VALUE))
228228
.addGroup(pnlCenterLayout.createSequentialGroup()
229229
.addGap(37, 37, 37)
230-
.addComponent(scrollPane, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE))
230+
.addComponent(scrollPane, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)
231+
.addContainerGap())
231232
);
232233

233234
tabMatchReplace.add(pnlCenter, java.awt.BorderLayout.CENTER);

src/yagura/view/JTransCoderTab.java

Lines changed: 110 additions & 114 deletions
Large diffs are not rendered by default.

src/yagura/view/LoggingTab.form

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<Component id="txtFileLimitSize" min="-2" pref="48" max="-2" attributes="0"/>
7272
<EmptySpace type="unrelated" max="-2" attributes="0"/>
7373
<Component id="lblFileUnit" min="-2" pref="30" max="-2" attributes="0"/>
74-
<EmptySpace type="unrelated" max="-2" attributes="0"/>
74+
<EmptySpace max="-2" attributes="0"/>
7575
<Component id="lblToolTip" min="-2" pref="224" max="-2" attributes="0"/>
7676
</Group>
7777
<Component id="chkHistoryLogInclude" alignment="0" min="-2" max="-2" attributes="0"/>

src/yagura/view/LoggingTab.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
170170
.addComponent(txtFileLimitSize, javax.swing.GroupLayout.PREFERRED_SIZE, 48, javax.swing.GroupLayout.PREFERRED_SIZE)
171171
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
172172
.addComponent(lblFileUnit, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE)
173-
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
173+
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
174174
.addComponent(lblToolTip, javax.swing.GroupLayout.PREFERRED_SIZE, 224, javax.swing.GroupLayout.PREFERRED_SIZE))
175175
.addComponent(chkHistoryLogInclude, javax.swing.GroupLayout.Alignment.LEADING)
176176
.addGroup(javax.swing.GroupLayout.Alignment.LEADING, pnlCenterLayout.createSequentialGroup()

src/yagura/view/SendToTab.form

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@
4848
<Group type="102" alignment="0" attributes="0">
4949
<EmptySpace max="-2" attributes="0"/>
5050
<Group type="103" groupAlignment="0" attributes="0">
51-
<Component id="chkSubmenu" min="-2" pref="133" max="-2" attributes="0"/>
5251
<Group type="102" attributes="0">
53-
<Component id="scrollSendTo" pref="472" max="32767" attributes="0"/>
52+
<Component id="scrollSendTo" pref="479" max="32767" attributes="0"/>
53+
<EmptySpace max="-2" attributes="0"/>
5454
<Group type="103" groupAlignment="0" attributes="0">
55-
<Group type="103" groupAlignment="0" attributes="0">
55+
<Group type="103" alignment="0" groupAlignment="0" attributes="0">
5656
<Component id="btnSendToEdit" alignment="1" min="-2" pref="83" max="-2" attributes="3"/>
5757
<Component id="btnSendToRemove" alignment="1" min="-2" pref="83" max="-2" attributes="3"/>
5858
<Component id="btnSendToAdd" alignment="1" min="-2" pref="83" max="-2" attributes="3"/>
@@ -65,9 +65,13 @@
6565
</Group>
6666
</Group>
6767
</Group>
68+
<EmptySpace min="-2" pref="5" max="-2" attributes="0"/>
69+
</Group>
70+
<Group type="102" attributes="0">
71+
<Component id="chkSubmenu" min="-2" pref="133" max="-2" attributes="0"/>
72+
<EmptySpace max="-2" attributes="0"/>
6873
</Group>
6974
</Group>
70-
<EmptySpace max="-2" attributes="0"/>
7175
</Group>
7276
</Group>
7377
</DimensionLayout>
@@ -78,7 +82,6 @@
7882
<Component id="chkSubmenu" min="-2" max="-2" attributes="0"/>
7983
<EmptySpace max="-2" attributes="0"/>
8084
<Group type="103" groupAlignment="0" attributes="0">
81-
<Component id="scrollSendTo" min="-2" pref="191" max="-2" attributes="1"/>
8285
<Group type="102" attributes="0">
8386
<Component id="btnSendToEdit" min="-2" max="-2" attributes="0"/>
8487
<EmptySpace max="-2" attributes="0"/>
@@ -89,9 +92,11 @@
8992
<Component id="btnSendToDownArraw" min="-2" max="-2" attributes="0"/>
9093
<EmptySpace max="-2" attributes="0"/>
9194
<Component id="btnSendToAdd" min="-2" max="-2" attributes="0"/>
95+
<EmptySpace min="0" pref="111" max="32767" attributes="0"/>
9296
</Group>
97+
<Component id="scrollSendTo" pref="0" max="32767" attributes="1"/>
9398
</Group>
94-
<EmptySpace pref="59" max="32767" attributes="0"/>
99+
<EmptySpace max="-2" attributes="0"/>
95100
</Group>
96101
</Group>
97102
</DimensionLayout>

src/yagura/view/SendToTab.java

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,8 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
144144
.addGroup(pnlCenterLayout.createSequentialGroup()
145145
.addContainerGap()
146146
.addGroup(pnlCenterLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
147-
.addComponent(chkSubmenu, javax.swing.GroupLayout.PREFERRED_SIZE, 133, javax.swing.GroupLayout.PREFERRED_SIZE)
148147
.addGroup(pnlCenterLayout.createSequentialGroup()
149-
.addComponent(scrollSendTo, javax.swing.GroupLayout.DEFAULT_SIZE, 472, Short.MAX_VALUE)
148+
.addComponent(scrollSendTo, javax.swing.GroupLayout.DEFAULT_SIZE, 479, Short.MAX_VALUE)
150149
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
151150
.addGroup(pnlCenterLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
152151
.addGroup(pnlCenterLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -157,8 +156,11 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
157156
.addGap(10, 10, 10)
158157
.addGroup(pnlCenterLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
159158
.addComponent(btnSendToDownArraw, javax.swing.GroupLayout.PREFERRED_SIZE, 62, javax.swing.GroupLayout.PREFERRED_SIZE)
160-
.addComponent(btnSendToUpArraw, javax.swing.GroupLayout.PREFERRED_SIZE, 62, javax.swing.GroupLayout.PREFERRED_SIZE))))))
161-
.addContainerGap())
159+
.addComponent(btnSendToUpArraw, javax.swing.GroupLayout.PREFERRED_SIZE, 62, javax.swing.GroupLayout.PREFERRED_SIZE))))
160+
.addGap(5, 5, 5))
161+
.addGroup(pnlCenterLayout.createSequentialGroup()
162+
.addComponent(chkSubmenu, javax.swing.GroupLayout.PREFERRED_SIZE, 133, javax.swing.GroupLayout.PREFERRED_SIZE)
163+
.addContainerGap())))
162164
);
163165
pnlCenterLayout.setVerticalGroup(
164166
pnlCenterLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -167,7 +169,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
167169
.addComponent(chkSubmenu)
168170
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
169171
.addGroup(pnlCenterLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
170-
.addComponent(scrollSendTo, javax.swing.GroupLayout.PREFERRED_SIZE, 191, javax.swing.GroupLayout.PREFERRED_SIZE)
171172
.addGroup(pnlCenterLayout.createSequentialGroup()
172173
.addComponent(btnSendToEdit)
173174
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
@@ -177,8 +178,10 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
177178
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
178179
.addComponent(btnSendToDownArraw)
179180
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
180-
.addComponent(btnSendToAdd)))
181-
.addContainerGap(59, Short.MAX_VALUE))
181+
.addComponent(btnSendToAdd)
182+
.addGap(0, 111, Short.MAX_VALUE))
183+
.addComponent(scrollSendTo, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE))
184+
.addContainerGap())
182185
);
183186

184187
tabSendTo.add(pnlCenter, java.awt.BorderLayout.CENTER);

src/yagura/view/TabbetOption.java

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ private void customizeComponents() {
6262
this.addTab("JSearch", this.tabJSearch);
6363
this.addTab("JTransCoder", this.tabJTransCoder);
6464
this.addTab("Version", this.tabVersion);
65-
65+
6666
this.tabEncoding.addPropertyChangeListener(ENCODING_PROPERTY, this);
6767
this.tabMatchReplace.addPropertyChangeListener(MATCHREPLACE_PROPERTY, this);
6868
this.tabMatchAlert.addPropertyChangeListener(MATCHALERT_PROPERTY, this);
@@ -137,7 +137,7 @@ public void setMatchReplaceProperty(MatchReplaceProperty matchReplaceProperty) {
137137
public MatchReplaceProperty getMatchReplaceProperty() {
138138
return this.tabMatchReplace.getMatchReplaceProperty();
139139
}
140-
140+
141141
@Override
142142
public void setSendToProperty(SendToProperty sendToProperty) {
143143
this.tabSendTo.setSendToProperty(sendToProperty);
@@ -147,7 +147,7 @@ public void setSendToProperty(SendToProperty sendToProperty) {
147147
public SendToProperty getSendToProperty() {
148148
return this.tabSendTo.getSendToProperty();
149149
}
150-
150+
151151
@Override
152152
public void setLoggingProperty(LoggingProperty loggingProperty) {
153153
this.tabLogging.setLoggingProperty(loggingProperty);
@@ -185,7 +185,7 @@ public void setAutoResponderProperty(AutoResponderProperty autoResponderProperty
185185
public AutoResponderProperty getAutoResponderProperty() {
186186
return this.tabAutoResponder.getAutoResponderProperty();
187187
}
188-
188+
189189
@Override
190190
public JSearchProperty getJSearchProperty() {
191191
return this.tabJSearch.getProperty();
@@ -195,8 +195,8 @@ public JSearchProperty getJSearchProperty() {
195195
public void setJSearchProperty(JSearchProperty jsearch) {
196196
this.tabJSearch.setProperty(jsearch);
197197
}
198-
199-
public void setJTransCoderProperty(EncodingProperty encodingProperty) {
198+
199+
public void setJTransCoderProperty(EncodingProperty encodingProperty) {
200200
this.tabJTransCoder.setEncodingList(encodingProperty.getEncodingList(), "");
201201
}
202202

@@ -209,7 +209,7 @@ public JTransCoderProperty getJTransCoderProperty() {
209209
public void setJTransCoderProperty(JTransCoderProperty transcoder) {
210210
this.tabJTransCoder.setProperty(transcoder);
211211
}
212-
212+
213213
@Override
214214
public boolean getDebugMode() {
215215
return this.tabVersion.getDebugMode();
@@ -219,7 +219,7 @@ public boolean getDebugMode() {
219219
public void setDebugMode(boolean debugMode) {
220220
this.tabVersion.setDebugMode(debugMode);
221221
}
222-
222+
223223
@Override
224224
public void propertyChange(PropertyChangeEvent evt) {
225225
this.firePropertyChange(evt.getPropertyName(), evt.getOldValue(), evt.getNewValue());
@@ -228,7 +228,7 @@ public void propertyChange(PropertyChangeEvent evt) {
228228
public void sendToJTransCoder(String text) {
229229
Container container = this.getParent();
230230
if (container instanceof JTabbedPane) {
231-
JTabbedPane tabbet = (JTabbedPane)container;
231+
JTabbedPane tabbet = (JTabbedPane) container;
232232
int index = tabbet.indexOfTab(this.getTabCaption());
233233
//BurpExtender.errPrintln("\tname u r:" + index);
234234
if (index > -1) {
@@ -238,20 +238,15 @@ public void sendToJTransCoder(String text) {
238238
tabbet.updateUI();
239239
}
240240
this.tabJTransCoder.sendToJTransCoder(text);
241-
// Class cls = this.getParent().getClass();
242-
// BurpExtender.errPrintln("name:" + cls.getName());
243-
// while ((cls = cls.getSuperclass()) != null) {
244-
// BurpExtender.errPrintln("\tname:" + cls.getName());
245-
// }
246241
}
247242

248-
public byte [] receiveFromJTransCoder() {
249-
return this.tabJTransCoder.receiveFromJTransCoder();
243+
public byte[] receiveFromJTransCoder() {
244+
return this.tabJTransCoder.receiveFromJTransCoder();
250245
}
251246

252247
@Override
253248
public void extensionUnloaded() {
254249
this.tabAutoResponder.extensionUnloaded();
255250
}
256-
251+
257252
}

src/yagura/view/VersionTab.java

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@
2929
*/
3030
public class VersionTab extends javax.swing.JPanel {
3131

32-
private OptionProperty option;
33-
3432
/**
3533
* Creates new form VersionTab
3634
*/
@@ -124,13 +122,13 @@ private void chkDebugModeStateChanged(javax.swing.event.ChangeEvent evt) {//GEN-
124122
this.firePropertyChange(TabbetOption.VERSION_PROPERTY, null, this);
125123
}//GEN-LAST:event_chkDebugModeStateChanged
126124

127-
final static FileFilter burp_config_filter = new FileNameExtensionFilter("burp configファイル(*.bcxml)", "bcxml");
125+
final static FileFilter BURP_CONFIG_FILTER = new FileNameExtensionFilter("burp configファイル(*.bcxml)", "bcxml");
128126

129127
private void btnImportActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnImportActionPerformed
130128
JFileChooser filechooser = new JFileChooser();
131129
filechooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
132-
filechooser.addChoosableFileFilter(burp_config_filter);
133-
filechooser.setFileFilter(burp_config_filter);
130+
filechooser.addChoosableFileFilter(BURP_CONFIG_FILTER);
131+
filechooser.setFileFilter(BURP_CONFIG_FILTER);
134132
int selected = filechooser.showOpenDialog(this);
135133
if (selected == JFileChooser.APPROVE_OPTION) {
136134
try {
@@ -146,13 +144,13 @@ private void btnImportActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIR
146144
private void btnExportActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnExportActionPerformed
147145
JFileChooser filechooser = new JFileChooser();
148146
filechooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
149-
filechooser.addChoosableFileFilter(burp_config_filter);
150-
filechooser.setFileFilter(burp_config_filter);
147+
filechooser.addChoosableFileFilter(BURP_CONFIG_FILTER);
148+
filechooser.setFileFilter(BURP_CONFIG_FILTER);
151149
int selected = filechooser.showSaveDialog(this);
152150
if (selected == JFileChooser.APPROVE_OPTION) {
153151
try {
154152
File file = filechooser.getSelectedFile();
155-
if (!burp_config_filter.accept(file)) {
153+
if (!BURP_CONFIG_FILTER.accept(file)) {
156154
file = new File(file.getAbsolutePath() + ".bcxml");
157155
}
158156
Config.saveToXML(file, BurpExtender.getInstance().getProperty());

0 commit comments

Comments
 (0)