Skip to content

Commit

Permalink
Changed the L&F to the cross-platform one.
Browse files Browse the repository at this point in the history
  • Loading branch information
mhmoodlan committed Jul 20, 2017
1 parent 499bd75 commit 976671d
Show file tree
Hide file tree
Showing 36 changed files with 20 additions and 535 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/nbproject/private/
6 changes: 3 additions & 3 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<!-- the Compile on Save feature is turned off for the project. -->
<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
<!-- in the project's Project Properties dialog box.-->
<project name="SubtitleSystem" default="default" basedir=".">
<description>Builds, tests, and runs the project SubtitleSystem.</description>
<project name="SubtitleSystem-Github" default="default" basedir=".">
<description>Builds, tests, and runs the project SubtitleSystem-Github.</description>
<import file="nbproject/build-impl.xml"/>
<!--
Expand Down Expand Up @@ -58,7 +58,7 @@
An example of overriding the target for project execution could look like this:
<target name="run" depends="SubtitleSystem-impl.jar">
<target name="run" depends="SubtitleSystem-Github-impl.jar">
<exec dir="bin" executable="launcher.exe">
<arg file="${dist.jar}"/>
</exec>
Expand Down
Empty file.
Empty file.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed build/classes/subtitlesystemviews/ClientViewer$1.class
Binary file not shown.
Binary file removed build/classes/subtitlesystemviews/ClientViewer.class
Binary file not shown.
Binary file removed build/classes/subtitlesystemviews/ServerViewer$1.class
Binary file not shown.
Binary file removed build/classes/subtitlesystemviews/ServerViewer$10.class
Binary file not shown.
Binary file removed build/classes/subtitlesystemviews/ServerViewer$11.class
Binary file not shown.
Binary file removed build/classes/subtitlesystemviews/ServerViewer$12.class
Binary file not shown.
Binary file removed build/classes/subtitlesystemviews/ServerViewer$13.class
Binary file not shown.
Binary file removed build/classes/subtitlesystemviews/ServerViewer$14.class
Binary file not shown.
Binary file removed build/classes/subtitlesystemviews/ServerViewer$15.class
Binary file not shown.
Binary file removed build/classes/subtitlesystemviews/ServerViewer$16.class
Binary file not shown.
Binary file removed build/classes/subtitlesystemviews/ServerViewer$17.class
Binary file not shown.
Binary file removed build/classes/subtitlesystemviews/ServerViewer$18.class
Binary file not shown.
Binary file removed build/classes/subtitlesystemviews/ServerViewer$19.class
Binary file not shown.
Binary file removed build/classes/subtitlesystemviews/ServerViewer$2.class
Binary file not shown.
Binary file removed build/classes/subtitlesystemviews/ServerViewer$3.class
Binary file not shown.
Binary file removed build/classes/subtitlesystemviews/ServerViewer$4.class
Binary file not shown.
Binary file removed build/classes/subtitlesystemviews/ServerViewer$5.class
Binary file not shown.
Binary file removed build/classes/subtitlesystemviews/ServerViewer$6.class
Binary file not shown.
Binary file removed build/classes/subtitlesystemviews/ServerViewer$7.class
Binary file not shown.
Binary file removed build/classes/subtitlesystemviews/ServerViewer$8.class
Binary file not shown.
Binary file removed build/classes/subtitlesystemviews/ServerViewer$9.class
Binary file not shown.
Binary file removed build/classes/subtitlesystemviews/ServerViewer.class
Binary file not shown.
502 changes: 0 additions & 502 deletions build/classes/subtitlesystemviews/ServerViewer.form

This file was deleted.

10 changes: 5 additions & 5 deletions nbproject/build-impl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ is divided into following sections:
- cleanup
-->
<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="SubtitleSystem-impl">
<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="SubtitleSystem-Github-impl">
<fail message="Please build using Ant 1.8.0 or higher.">
<condition>
<not>
Expand Down Expand Up @@ -443,7 +443,7 @@ is divided into following sections:
</fileset>
</union>
<taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
<testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="SubtitleSystem" testname="TestNG tests" workingDir="${work.dir}">
<testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="SubtitleSystem-Github" testname="TestNG tests" workingDir="${work.dir}">
<xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
<propertyset>
<propertyref prefix="test-sys-prop."/>
Expand Down Expand Up @@ -594,7 +594,7 @@ is divided into following sections:
<condition else="-testclass @{testClass}" property="test.class.or.method" value="-methods @{testClass}.@{testMethod}">
<isset property="test.method"/>
</condition>
<condition else="-suitename SubtitleSystem -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
<condition else="-suitename SubtitleSystem-Github -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
<matches pattern=".*\.xml" string="@{testClass}"/>
</condition>
<delete dir="${build.test.results.dir}" quiet="true"/>
Expand Down Expand Up @@ -886,7 +886,7 @@ is divided into following sections:
<delete file="${built-jar.properties}" quiet="true"/>
</target>
<target if="already.built.jar.${basedir}" name="-warn-already-built-jar">
<echo level="warn" message="Cycle detected: SubtitleSystem was already built"/>
<echo level="warn" message="Cycle detected: SubtitleSystem-Github was already built"/>
</target>
<target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps">
<mkdir dir="${build.dir}"/>
Expand Down Expand Up @@ -1371,7 +1371,7 @@ is divided into following sections:
<delete file="${built-clean.properties}" quiet="true"/>
</target>
<target if="already.built.clean.${basedir}" name="-warn-already-built-clean">
<echo level="warn" message="Cycle detected: SubtitleSystem was already built"/>
<echo level="warn" message="Cycle detected: SubtitleSystem-Github was already built"/>
</target>
<target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps">
<mkdir dir="${build.dir}"/>
Expand Down
8 changes: 4 additions & 4 deletions nbproject/genfiles.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
build.xml.data.CRC32=5697a916
build.xml.script.CRC32=b8c61103
build.xml.data.CRC32=efd57507
build.xml.script.CRC32=18d73e0e
build.xml.stylesheet.CRC32=[email protected]
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=5697a916
nbproject/build-impl.xml.script.CRC32=96d91b70
nbproject/build-impl.xml.data.CRC32=efd57507
nbproject/build-impl.xml.script.CRC32=2a51842a
nbproject/build-impl.xml.stylesheet.CRC32=[email protected]
7 changes: 1 addition & 6 deletions nbproject/private/private.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,6 @@
</file>
</editor-bookmarks>
<open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
<group>
<file>file:/D:/All_about_Programming/Java%20projects/NetBeans/SubtitleSystem/src/subtitlesystemviews/ClientViewer.java</file>
<file>file:/D:/All_about_Programming/Java%20projects/NetBeans/SubtitleSystem/src/subtitlesystemcontrollers/ClientController.java</file>
<file>file:/D:/All_about_Programming/Java%20projects/NetBeans/SubtitleSystem/src/subtitlesystemviews/ServerViewer.java</file>
<file>file:/D:/All_about_Programming/Java%20projects/NetBeans/SubtitleSystem/src/subtitlesystemcontrollers/ServerController.java</file>
</group>
<group/>
</open-files>
</project-private>
4 changes: 2 additions & 2 deletions nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ annotation.processing.enabled.in.editor=false
annotation.processing.processors.list=
annotation.processing.run.all.processors=true
annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
application.title=SubtitleSystem
application.title=SubtitleSystem-Github
application.vendor=Mahmoud Aslan
build.classes.dir=${build.dir}/classes
build.classes.excludes=tedxsubtitleserver
Expand All @@ -25,7 +25,7 @@ debug.test.classpath=\
dist.archive.excludes=
# This directory is removed when the project is cleaned:
dist.dir=dist
dist.jar=${dist.dir}/SubtitleSystem.jar
dist.jar=${dist.dir}/SubtitleSystem-Github.jar
dist.javadoc.dir=${dist.dir}/javadoc
endorsed.classpath=
excludes=
Expand Down
2 changes: 1 addition & 1 deletion nbproject/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<type>org.netbeans.modules.java.j2seproject</type>
<configuration>
<data xmlns="http://www.netbeans.org/ns/j2se-project/3">
<name>SubtitleSystem</name>
<name>SubtitleSystem-Github</name>
<source-roots>
<root id="src.dir"/>
</source-roots>
Expand Down
15 changes: 3 additions & 12 deletions src/subtitlesystemviews/ServerViewer.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
/*
* 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 subtitlesystemviews;

import java.io.BufferedReader;
Expand All @@ -14,6 +8,7 @@
import javax.swing.JFileChooser;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.UIManager;
import subtitlesystemcontrollers.ClientController;
import subtitlesystemcontrollers.ServerController;

Expand Down Expand Up @@ -507,12 +502,8 @@ public static void main(String args[]) {
* For details see http://download.oracle.com/javase/tutorial/uiswing/lookandfeel/plaf.html
*/
try {
for (javax.swing.UIManager.LookAndFeelInfo info : javax.swing.UIManager.getInstalledLookAndFeels()) {
if ("Nimbus".equals(info.getName())) {
javax.swing.UIManager.setLookAndFeel(info.getClassName());
break;
}
}
UIManager.setLookAndFeel(
UIManager.getCrossPlatformLookAndFeelClassName());
} catch (ClassNotFoundException ex) {
java.util.logging.Logger.getLogger(ServerViewer.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
} catch (InstantiationException ex) {
Expand Down

0 comments on commit 976671d

Please sign in to comment.