Skip to content

Commit

Permalink
empty
Browse files Browse the repository at this point in the history
  • Loading branch information
@rjolly
rjolly committed Jul 6, 2018
1 parent 29b97ef commit aeb2b65
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 8 deletions.
16 changes: 15 additions & 1 deletion html/src/linoleum/html/Browser.form
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,18 @@
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="1" attributes="0">
<Component id="jLabel4" min="-2" max="-2" attributes="0"/>
<Component id="jLabel3" min="-2" max="-2" attributes="0"/>
<Component id="jLabel2" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="jTextField2" pref="283" max="32767" attributes="0"/>
<Component id="jTextField2" max="32767" attributes="0"/>
<Group type="102" attributes="0">
<Component id="jComboBox1" min="-2" max="-2" attributes="0"/>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
<Component id="jTextField3" max="32767" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
</Group>
Expand All @@ -47,6 +49,11 @@
<Component id="jLabel3" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="jComboBox1" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="jLabel4" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="jTextField3" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="32767" attributes="0"/>
</Group>
</Group>
Expand Down Expand Up @@ -75,6 +82,13 @@
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jComboBox1ActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JLabel" name="jLabel4">
<Properties>
<Property name="text" type="java.lang.String" value="User agent:"/>
</Properties>
</Component>
<Component class="javax.swing.JTextField" name="jTextField3">
</Component>
</SubComponents>
</Container>
</NonVisualComponents>
Expand Down
33 changes: 26 additions & 7 deletions html/src/linoleum/html/Browser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ public class Browser extends FileSupport {

@Override
public void preferenceChange(final PreferenceChangeEvent evt) {
if (evt.getKey().equals(getKey("fontSize"))) {
resize();
if (evt.getKey().equals(getKey("fontSize")) || evt.getKey().equals(getKey("userAgent"))) {
reconf();
}
}

Expand All @@ -75,7 +75,7 @@ public Browser() {
setIcon(new ImageIcon(getClass().getResource("/toolbarButtonGraphics/development/WebComponent24.gif")));
setMimeType("text/html");
setScheme("http:https");
resize();
reconf();
jEditorPane1.setDefaultEditorKit(new DefaultEditorKit() {
@Override
public void read(final Reader r, final Document doc, final int pos) {
Expand Down Expand Up @@ -141,6 +141,7 @@ private void open(final String str) {
public void load() {
jTextField2.setText(getHome());
jComboBox1.setSelectedItem(getFontSize());
jTextField3.setText(getUserAgent());
}

private String getHome() {
Expand All @@ -151,14 +152,20 @@ private int getFontSize() {
return prefs.getInt(getKey("fontSize"), jEditorPane1.getFont().getSize());
}

private void resize() {
private String getUserAgent() {
return prefs.get(getKey("userAgent"), "");
}

private void reconf() {
jEditorPane1.setFont(jEditorPane1.getFont().deriveFont((float) getFontSize()));
jEditorPane1.setUserAgent(getUserAgent());
}

@Override
public void save() {
prefs.put(getKey("home"), jTextField2.getText());
prefs.putInt(getKey("fontSize"), (Integer) jComboBox1.getSelectedItem());
prefs.put(getKey("userAgent"), jTextField3.getText());
}

@Override
Expand Down Expand Up @@ -344,6 +351,8 @@ private void initComponents() {
jTextField2 = new javax.swing.JTextField();
jLabel3 = new javax.swing.JLabel();
jComboBox1 = new javax.swing.JComboBox();
jLabel4 = new javax.swing.JLabel();
jTextField3 = new javax.swing.JTextField();
jPanel3 = new javax.swing.JPanel();
jButton2 = new javax.swing.JButton();
jButton3 = new javax.swing.JButton();
Expand Down Expand Up @@ -376,21 +385,25 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
}
});

jLabel4.setText("User agent:");

javax.swing.GroupLayout optionPanel1Layout = new javax.swing.GroupLayout(optionPanel1);
optionPanel1.setLayout(optionPanel1Layout);
optionPanel1Layout.setHorizontalGroup(
optionPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(optionPanel1Layout.createSequentialGroup()
.addContainerGap()
.addGroup(optionPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(jLabel4)
.addComponent(jLabel3)
.addComponent(jLabel2))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(optionPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jTextField2, javax.swing.GroupLayout.DEFAULT_SIZE, 283, Short.MAX_VALUE)
.addComponent(jTextField2)
.addGroup(optionPanel1Layout.createSequentialGroup()
.addComponent(jComboBox1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(0, 0, Short.MAX_VALUE)))
.addGap(0, 0, Short.MAX_VALUE))
.addComponent(jTextField3))
.addContainerGap())
);
optionPanel1Layout.setVerticalGroup(
Expand All @@ -404,6 +417,10 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
.addGroup(optionPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(jLabel3)
.addComponent(jComboBox1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(optionPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(jLabel4)
.addComponent(jTextField3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);

Expand Down Expand Up @@ -474,7 +491,7 @@ public void hyperlinkUpdate(javax.swing.event.HyperlinkEvent evt) {
.addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addContainerGap())
.addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)
.addComponent(jPanel2, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 394, Short.MAX_VALUE)
.addComponent(jPanel2, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 394, Short.MAX_VALUE)
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
Expand Down Expand Up @@ -554,13 +571,15 @@ private void jPopupMenu1PopupMenuWillBecomeVisible(javax.swing.event.PopupMenuEv
private javax.swing.JLabel jLabel1;
private javax.swing.JLabel jLabel2;
private javax.swing.JLabel jLabel3;
private javax.swing.JLabel jLabel4;
private javax.swing.JPanel jPanel2;
private javax.swing.JPanel jPanel3;
private javax.swing.JPopupMenu jPopupMenu1;
private javax.swing.JProgressBar jProgressBar1;
private javax.swing.JScrollPane jScrollPane1;
private javax.swing.JTextField jTextField1;
private javax.swing.JTextField jTextField2;
private javax.swing.JTextField jTextField3;
private linoleum.application.OptionPanel optionPanel1;
// End of variables declaration//GEN-END:variables
}
8 changes: 8 additions & 0 deletions html/src/linoleum/html/EditorPane.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ public class EditorPane extends JEditorPane {
private final Logger logger = Logger.getLogger(getClass().getName());
private PageLoader loader;
private EditorKit kit;
private String agent;

void setLoader(final PageLoader loader) {
this.loader = loader;
Expand All @@ -45,6 +46,10 @@ void setDefaultEditorKit(final EditorKit kit) {
this.kit = kit;
}

void setUserAgent(final String agent) {
this.agent = agent;
}

@Override
protected EditorKit createDefaultEditorKit() {
return kit == null?super.createDefaultEditorKit():kit;
Expand Down Expand Up @@ -160,6 +165,9 @@ private InputStream getStream(final URL page, final String auth) throws IOExcept
}
conn.addRequestProperty("Authorization", map.get(host));
}
if (agent != null && !agent.isEmpty()) {
conn.addRequestProperty("User-Agent", agent);
}
if (conn instanceof HttpURLConnection) {
final HttpURLConnection hconn = (HttpURLConnection) conn;
hconn.setInstanceFollowRedirects(false);
Expand Down

0 comments on commit aeb2b65

Please sign in to comment.