-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'refs/remotes/origin/0.1.2.2-ALPHA'
- Loading branch information
Showing
11 changed files
with
647 additions
and
97 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <groupId>ca.osmcanada</groupId> | ||
| <artifactId>OSVUploadr</artifactId> | ||
| <<<<<<< HEAD | ||
| <version>0.1.2.1.1-ALPHA</version> | ||
| ======= | ||
| <version>0.1.2.2-ALPHA</version> | ||
| >>>>>>> Automatic oAuth | ||
| <packaging>jar</packaging> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>com.github.scribejava</groupId> | ||
| <artifactId>scribejava-apis</artifactId> | ||
| <version>2.8.1</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.drewnoakes</groupId> | ||
| <artifactId>metadata-extractor</artifactId> | ||
| <version>2.9.1</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.apache.httpcomponents</groupId> | ||
| <artifactId>httpclient</artifactId> | ||
| <version>4.5.2</version> | ||
| </dependency> | ||
| </dependencies> | ||
| <properties> | ||
| <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | ||
| <maven.compiler.source>1.8</maven.compiler.source> | ||
| <maven.compiler.target>1.8</maven.compiler.target> | ||
| </properties> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-assembly-plugin</artifactId> | ||
| <version>2.6</version> | ||
| <configuration> | ||
| <archive> | ||
| <manifest> | ||
| <mainClass>ca.osmcanada.osvuploadr.JFMain</mainClass> | ||
| </manifest> | ||
| </archive> | ||
| <descriptorRefs> | ||
| <descriptorRef>jar-with-dependencies</descriptorRef> | ||
| </descriptorRefs> | ||
| </configuration> | ||
| <executions> | ||
| <execution> | ||
| <id>make-assembly</id> <!-- this is used for inheritance merges --> | ||
| <phase>package</phase> <!-- bind to the packaging phase --> | ||
| <goals> | ||
| <goal>single</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
55 changes: 55 additions & 0 deletions
55
OSVUploadr/src/main/java/ca/osmcanada/osvuploadr/JPInfoBox.form
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| <?xml version="1.0" encoding="UTF-8" ?> | ||
|
|
||
| <Form version="1.3" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JPanelFormInfo"> | ||
| <Properties> | ||
| <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> | ||
| <Dimension value="[623, 150]"/> | ||
| </Property> | ||
| </Properties> | ||
| <AuxValues> | ||
| <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/> | ||
| <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/> | ||
| <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/> | ||
| <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/> | ||
| <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/> | ||
| <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/> | ||
| <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/> | ||
| <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/> | ||
| <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/> | ||
| </AuxValues> | ||
|
|
||
| <Layout> | ||
| <DimensionLayout dim="0"> | ||
| <Group type="103" groupAlignment="0" attributes="0"> | ||
| <Group type="102" alignment="0" attributes="0"> | ||
| <EmptySpace max="-2" attributes="0"/> | ||
| <Component id="jLabel1" min="-2" max="-2" attributes="0"/> | ||
| <EmptySpace max="-2" attributes="0"/> | ||
| <Component id="jlProcessing" pref="426" max="32767" attributes="0"/> | ||
| <EmptySpace max="-2" attributes="0"/> | ||
| </Group> | ||
| </Group> | ||
| </DimensionLayout> | ||
| <DimensionLayout dim="1"> | ||
| <Group type="103" groupAlignment="0" attributes="0"> | ||
| <Group type="102" attributes="0"> | ||
| <EmptySpace max="-2" attributes="0"/> | ||
| <Group type="103" groupAlignment="3" attributes="0"> | ||
| <Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/> | ||
| <Component id="jlProcessing" alignment="3" min="-2" pref="47" max="-2" attributes="0"/> | ||
| </Group> | ||
| <EmptySpace pref="78" max="32767" attributes="0"/> | ||
| </Group> | ||
| </Group> | ||
| </DimensionLayout> | ||
| </Layout> | ||
| <SubComponents> | ||
| <Component class="javax.swing.JLabel" name="jLabel1"> | ||
| <Properties> | ||
| <Property name="text" type="java.lang.String" value="Currently Processing:"/> | ||
| </Properties> | ||
| </Component> | ||
| <Component class="javax.swing.JLabel" name="jlProcessing"> | ||
| </Component> | ||
| </SubComponents> | ||
| </Form> |
73 changes: 73 additions & 0 deletions
73
OSVUploadr/src/main/java/ca/osmcanada/osvuploadr/JPInfoBox.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| /* | ||
| * To change this license header, choose License Headers in Project Properties. | ||
| * To change this template file, choose Tools | Templates | ||
| * and open the template in the editor. | ||
| */ | ||
| package ca.osmcanada.osvuploadr; | ||
|
|
||
| import javax.swing.UIManager; | ||
|
|
||
| /** | ||
| * | ||
| * @author Nadeaj | ||
| */ | ||
| public class JPInfoBox extends javax.swing.JPanel { | ||
|
|
||
| /** | ||
| * Creates new form JPInfoBox | ||
| */ | ||
| public JPInfoBox() { | ||
| try{ | ||
| UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); | ||
| } | ||
| catch(Exception ex){} | ||
| initComponents(); | ||
| } | ||
|
|
||
| public void SetProcessingText(String str){ | ||
| jlProcessing.setText(str); | ||
| } | ||
| /** | ||
| * This method is called from within the constructor to initialize the form. | ||
| * WARNING: Do NOT modify this code. The content of this method is always | ||
| * regenerated by the Form Editor. | ||
| */ | ||
| @SuppressWarnings("unchecked") | ||
| // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents | ||
| private void initComponents() { | ||
|
|
||
| jLabel1 = new javax.swing.JLabel(); | ||
| jlProcessing = new javax.swing.JLabel(); | ||
|
|
||
| setPreferredSize(new java.awt.Dimension(623, 150)); | ||
|
|
||
| jLabel1.setText("Currently Processing:"); | ||
|
|
||
| javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); | ||
| this.setLayout(layout); | ||
| layout.setHorizontalGroup( | ||
| layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) | ||
| .addGroup(layout.createSequentialGroup() | ||
| .addContainerGap() | ||
| .addComponent(jLabel1) | ||
| .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) | ||
| .addComponent(jlProcessing, javax.swing.GroupLayout.DEFAULT_SIZE, 426, Short.MAX_VALUE) | ||
| .addContainerGap()) | ||
| ); | ||
| layout.setVerticalGroup( | ||
| layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) | ||
| .addGroup(layout.createSequentialGroup() | ||
| .addContainerGap() | ||
| .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) | ||
| .addComponent(jLabel1) | ||
| .addComponent(jlProcessing, javax.swing.GroupLayout.PREFERRED_SIZE, 47, javax.swing.GroupLayout.PREFERRED_SIZE)) | ||
| .addContainerGap(78, Short.MAX_VALUE)) | ||
| ); | ||
| }// </editor-fold>//GEN-END:initComponents | ||
|
|
||
|
|
||
| // Variables declaration - do not modify//GEN-BEGIN:variables | ||
| private javax.swing.JLabel jLabel1; | ||
| private javax.swing.JLabel jlProcessing; | ||
| // End of variables declaration//GEN-END:variables | ||
| } |
Oops, something went wrong.