Netsyms/SyMAT
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

A little refactoring

Browse Source
This commit is contained in:
skylarmt 2014-12-19 18:01:58 -07:00
parent a4ff46856a
commit 5a82b88351
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/apocalypselabs/symat/CodeExport.java
View File

@ -130,7 +130,7 @@ public class CodeExport extends javax.swing.JInternalFrame {
html = new SimpleHtmlSerializer(props).getAsString(node); html = new SimpleHtmlSerializer(props).getAsString(node);
html = html.replace("'", "'"); html = html.replace("'", "'");
html = html.replace("<?xml version=\"1.0\" encoding=\"UTF-8\"?>", ""); html = html.replace("<?xml version=\"1.0\" encoding=\"UTF-8\"?>", "");
System.out.println(html); Debug.println(html);
return html; return html;
} }

6
src/net/apocalypselabs/symat/SplashScreen.form
View File

@ -36,7 +36,7 @@
<Layout> <Layout>
<DimensionLayout dim="0"> <DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Component id="jProgressBar1" max="32767" attributes="0"/> <Component id="progBar" max="32767" attributes="0"/>
<Component id="jLabel5" min="-2" max="-2" attributes="0"/> <Component id="jLabel5" min="-2" max="-2" attributes="0"/>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
@ -45,13 +45,13 @@
<Group type="102" alignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0">
<Component id="jLabel5" min="-2" max="-2" attributes="0"/> <Component id="jLabel5" min="-2" max="-2" attributes="0"/>
<EmptySpace min="0" pref="0" max="-2" attributes="0"/> <EmptySpace min="0" pref="0" max="-2" attributes="0"/>
<Component id="jProgressBar1" min="-2" max="-2" attributes="0"/> <Component id="progBar" min="-2" max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
</Layout> </Layout>
<SubComponents> <SubComponents>
<Component class="javax.swing.JProgressBar" name="jProgressBar1"> <Component class="javax.swing.JProgressBar" name="progBar">
<Properties> <Properties>
<Property name="indeterminate" type="boolean" value="true"/> <Property name="indeterminate" type="boolean" value="true"/>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">

38
src/net/apocalypselabs/symat/SplashScreen.java
View File

@ -54,7 +54,7 @@ public class SplashScreen extends javax.swing.JFrame {
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
private void initComponents() { private void initComponents() {
jProgressBar1 = new javax.swing.JProgressBar(); progBar = new javax.swing.JProgressBar();
jLabel5 = new javax.swing.JLabel(); jLabel5 = new javax.swing.JLabel();
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
@ -68,12 +68,12 @@ public class SplashScreen extends javax.swing.JFrame {
} }
}); });
jProgressBar1.setIndeterminate(true); progBar.setIndeterminate(true);
jProgressBar1.setMaximumSize(new java.awt.Dimension(32767, 20)); progBar.setMaximumSize(new java.awt.Dimension(32767, 20));
jProgressBar1.setMinimumSize(new java.awt.Dimension(10, 20)); progBar.setMinimumSize(new java.awt.Dimension(10, 20));
jProgressBar1.setPreferredSize(new java.awt.Dimension(146, 20)); progBar.setPreferredSize(new java.awt.Dimension(146, 20));
jProgressBar1.setString(""); progBar.setString("");
jProgressBar1.setStringPainted(true); progBar.setStringPainted(true);
jLabel5.setIcon(new javax.swing.ImageIcon(getClass().getResource("/net/apocalypselabs/symat/splash.png"))); // NOI18N jLabel5.setIcon(new javax.swing.ImageIcon(getClass().getResource("/net/apocalypselabs/symat/splash.png"))); // NOI18N
@ -81,7 +81,7 @@ public class SplashScreen extends javax.swing.JFrame {
getContentPane().setLayout(layout); getContentPane().setLayout(layout);
layout.setHorizontalGroup( layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jProgressBar1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(progBar, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(jLabel5) .addComponent(jLabel5)
); );
layout.setVerticalGroup( layout.setVerticalGroup(
@ -89,7 +89,7 @@ public class SplashScreen extends javax.swing.JFrame {
.addGroup(layout.createSequentialGroup() .addGroup(layout.createSequentialGroup()
.addComponent(jLabel5) .addComponent(jLabel5)
.addGap(0, 0, 0) .addGap(0, 0, 0)
.addComponent(jProgressBar1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addComponent(progBar, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
); );
pack(); pack();
@ -132,9 +132,9 @@ public class SplashScreen extends javax.swing.JFrame {
SwingUtilities.invokeLater(new Runnable() { SwingUtilities.invokeLater(new Runnable() {
@Override @Override
public void run() { public void run() {
jProgressBar1.setIndeterminate(false); progBar.setIndeterminate(false);
jProgressBar1.setValue(prog); progBar.setValue(prog);
jProgressBar1.setString(lbl); progBar.setString(lbl);
} }
}); });
} }
@ -149,15 +149,15 @@ public class SplashScreen extends javax.swing.JFrame {
SwingUtilities.invokeLater(new Runnable() { SwingUtilities.invokeLater(new Runnable() {
@Override @Override
public void run() { public void run() {
String val = jProgressBar1.getString(); String val = progBar.getString();
if (val.endsWith("...")) { if (val.endsWith("...")) {
jProgressBar1.setString(val.replace("...", "")); progBar.setString(val.replace("...", ""));
} else if (val.endsWith("..")) { } else if (val.endsWith("..")) {
jProgressBar1.setString(val.replace("..", "...")); progBar.setString(val.replace("..", "..."));
} else if (val.endsWith(".")) { } else if (val.endsWith(".")) {
jProgressBar1.setString(val.replace(".", "..")); progBar.setString(val.replace(".", ".."));
} else if (!val.endsWith(".")) { } else if (!val.endsWith(".")) {
jProgressBar1.setString(val+"."); progBar.setString(val+".");
} }
} }
}); });
@ -176,6 +176,6 @@ public class SplashScreen extends javax.swing.JFrame {
} }
// Variables declaration - do not modify//GEN-BEGIN:variables // Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JLabel jLabel5; private javax.swing.JLabel jLabel5;
private javax.swing.JProgressBar jProgressBar1; private javax.swing.JProgressBar progBar;
// End of variables declaration//GEN-END:variables // End of variables declaration//GEN-END:variables
} }