sipwise
/
jitsi
mirror of https://github.com/sipwise/jitsi.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Patch provided by Adam Netocny, icluding some skin jar builder enhancements + javadocs.

Browse Source
cusax-fix
Yana Stamcheva 15 years ago
parent eebf8a0c4a
commit 42fbfc3964
12 changed files with 111 additions and 23 deletions
Show Stats Download Patch File Download Diff File

6
build.xml
Unescape View File

@ -45,7 +45,7 @@
<property name="inst.resrc" value="${sc.basedir}/resources/install"/>
<property name='j2se_api' value='http://java.sun.com/j2se/1.5/docs/api' />
<property name='maxwarns' value='10000' />
<property name='java.net.preferIPv6Addresses' value='true' />
<property name='java.net.preferIPv6Addresses' value='false' />
<!-- set the build label property and make it take the cc bild into account -->
<condition property="build.label"
@ -746,8 +746,8 @@
<sysproperty key="java.net.preferIPv6Addresses"
value="${java.net.preferIPv6Addresses}"/>
<!--sysproperty key="net.java.sip.communicator.SC_HOME_DIR_LOCATION"
value="${user.home}/schome"/-->
<sysproperty key="net.java.sip.communicator.SC_HOME_DIR_LOCATION"
value="${user.home}/schome"/>
<!-- this is a temporary option that would need to disappear once
we finalize jingle -->

48
src/net/java/sip/communicator/impl/resources/ResourceManagementServiceImpl.java
Unescape View File

@ -25,7 +25,7 @@
* @author Damian Minkov
* @author Yana Stamcheva
* @author Lubomir Marinov
* @author Adam Netocny, CircleTech, s.r.o.
* @author Adam Netocny
*/
public class ResourceManagementServiceImpl
implements ResourceManagementService,
@ -34,13 +34,34 @@ public class ResourceManagementServiceImpl
private static Logger logger =
Logger.getLogger(ResourceManagementServiceImpl.class);
/**
* Resources for currently loaded <tt>ColorPack</tt>.
*/
private Map<String, String> colorResources;
/**
* Currently loaded color pack.
*/
private ResourcePack colorPack = null;
/**
* Resources for currently loaded <tt>ImagePack</tt>.
*/
private Map<String, String> imageResources;
/**
* Currently loaded image pack.
*/
private ResourcePack imagePack = null;
/**
* Resources for currently loaded <tt>LanguagePack</tt>.
*/
private Map<String, String> languageResources;
/**
* Currently loaded language pack.
*/
private LanguagePack languagePack = null;
/**
@ -50,13 +71,34 @@ public class ResourceManagementServiceImpl
*/
private Locale languageLocale;
/**
* Resources for currently loaded <tt>SettingsPack</tt>.
*/
private Map<String, String> settingsResources;
/**
* Currently loaded settings pack.
*/
private ResourcePack settingsPack = null;
/**
* Resources for currently loaded <tt>SoundPack</tt>.
*/
private Map<String, String> soundResources;
/**
* Currently loaded sound pack.
*/
private ResourcePack soundPack = null;
/**
* Resources for currently loaded <tt>SkinPack</tt>.
*/
private Map<String, String> skinResources;
/**
* Currently loaded <tt>SkinPack</tt>.
*/
private SkinPack skinPack = null;
/**
@ -125,6 +167,7 @@ public class ResourceManagementServiceImpl
/**
* Searches for the <tt>ResourcePack</tt> corresponding to the given
* <tt>className</tt> and <tt></tt>.
*
* @param className The name of the resource class.
* @param typeName The name of the type we're looking for.
* For example: RESOURCE_NAME_DEFAULT_VALUE
@ -176,6 +219,8 @@ private Map<String, String> getResources(ResourcePack resourcePack)
/**
* Handles all <tt>ServiceEvent</tt>s corresponding to <tt>ResourcePack</tt>
* being registered or unregistered.
*
* @param event the <tt>ServiceEvent</tt> that notified us
*/
public void serviceChanged(ServiceEvent event)
{
@ -760,6 +805,7 @@ public ImageIcon getImage(String imageID)
/**
* Builds a new skin bundle from the zip file content.
*
* @param zipFile Zip file with skin information.
* @return <tt>File</tt> for the bundle.
* @throws Exception When something goes wrong.

62
src/net/java/sip/communicator/impl/resources/util/SkinJarBuilder.java
Unescape View File

@ -12,12 +12,13 @@
/**
* Class for building of skin bundles from zip files.
* @author Adam Netocny, CircleTech, s.r.o.
* @author Adam Netocny
*/
public class SkinJarBuilder
{
/**
* Creates bundle from zip file.
*
* @param zip Zip file with skin contents.
* @return Jar <tt>File</tt>.
* @throws Exception When something goes wrong.
@ -47,6 +48,10 @@ public static File createBundleFromZip(File zip)
/**
* Creates a copy of skinresources.jar in temp folder.
*
* @return the location of the temp file.
* @throws IOException Is thrown if the jar cannot be located or if a file
* operation goes wrong.
*/
private static File cpTmp()
throws IOException
@ -81,9 +86,13 @@ private static File cpTmp()
/**
* Unzip given file to temp folder.
*
* @param zip ZIP <tt>File</tt> to be unzipped.
* @return temporary directory with the content of the ZIP file.
* @throws IOException Is thrown if a file operation goes wrong.
*/
private static File unzipIntoTmp(File zip)
throws Exception
throws IOException
{
File dest = File.createTempFile("zip", null);
@ -131,7 +140,11 @@ private static File unzipIntoTmp(File zip)
}
/**
* Inserts files into zip file.
* Inserts files into ZIP file.
*
* @param jar Destination ZIP file to store the data.
* @param tmpDir Folder which contains the data.
* @throws IOException Is thrown if a file operation goes wrong.
*/
private static void insertIntoZip(File jar, File tmpDir)
throws IOException
@ -173,7 +186,11 @@ private static void insertIntoZip(File jar, File tmpDir)
}
/**
* Zip the content of a folder.
* Zips the content of a folder.
* @param dir2zip Path to the directory with the data to be stored.
* @param zos Opened <tt>ZipOutputStream</tt> in which will be information
* stored.
* @throws IOException Is thrown if a file operation goes wrong.
*/
private static void zipDir(String dir2zip, ZipOutputStream zos)
throws IOException
@ -183,7 +200,12 @@ private static void zipDir(String dir2zip, ZipOutputStream zos)
}
/**
* Zip a file.
* Zips a file.
* @param directory Path to the dir with the data to be stored.
* @param base Base path for cutting paths into zip entries.
* @param zos Opened <tt>ZipOutputStream</tt> in which will be information
* stored.
* @throws IOException Is thrown if a file operation goes wrong.
*/
private static final void zip(File directory, File base, ZipOutputStream zos)
throws IOException
@ -212,7 +234,9 @@ private static final void zip(File directory, File base, ZipOutputStream zos)
}
/**
* Deletes a dir with all subdirs.
* Deletes a directory with all its sub-directories.
*
* @param tmp the directory to be deleted
*/
private static void deleteDir(File tmp)
{
@ -237,6 +261,10 @@ private static void deleteDir(File tmp)
/**
* Tests if the content of a folder has the same structure as the skin
* content.
*
* @param tmpDir Directory to be tested.
* @return <tt>true</tt> - if the directory contains valid skin, else
* <tt>false</tt>.
*/
private static boolean test(File tmpDir)
{
@ -330,8 +358,10 @@ else if (f.getName().equals("styles"))
}
/**
* Moves to toplevel dir for unziped files. (e.g. /dir/info.propreties will
* be changed to /info.properties.)
* Moves to top level directory for unziped files. (e.g.
* /dir/info.propreties will be changed to /info.properties.)
* @param tmpDir Directory in which is the skin unzipped.
* @return the top level directory
*/
private static File findBase(File tmpDir)
{
@ -357,9 +387,21 @@ private static File findBase(File tmpDir)
if (!test)
{
if (list.length == 1)
if (list.length != 0)
{
return list[0];
File tmp = null;
for (File f : list)
{
if(f.isDirectory())
{
File tmp2 = findBase(f);
if(tmp2 != null && tmp == null)
{
tmp = tmp2;
}
}
}
return tmp;
}
else
{

2
src/net/java/sip/communicator/plugin/skinmanager/ManageButtonsPanel.java
Unescape View File

@ -21,7 +21,7 @@
* The panel containing all buttons for the <tt>PluginManagerConfigForm</tt>.
*
* @author Yana Stamcheva
* @author Adam Netocony, CircleTech, s.r.o.
* @author Adam Netocony
*/
public class ManageButtonsPanel
extends TransparentPanel

2
src/net/java/sip/communicator/plugin/skinmanager/SkinListCellRenderer.java
Unescape View File

@ -25,7 +25,7 @@
* The cell border and background are repainted.
*
* @author Yana Stamcheva
* @author Adam Netocny, CircleTech, s.r.o.
* @author Adam Netocny
*/
public class SkinListCellRenderer
extends JPanel

2
src/net/java/sip/communicator/plugin/skinmanager/SkinManagerPanel.java
Unescape View File

@ -18,7 +18,7 @@
/**
* @author Yana Stamcheva
* @author Adam Netocny, CircleTech, s.r.o.
* @author Adam Netocny
*/
public class SkinManagerPanel
extends TransparentPanel

2
src/net/java/sip/communicator/plugin/skinmanager/SkinTableModel.java
Unescape View File

@ -16,7 +16,7 @@
* The <tt>TableModel</tt> of the table containing all plug-ins.
*
* @author Yana Stamcheva
* @author Adam Netocny, CircleTech, s.r.o.
* @author Adam Netocny
*/
public class SkinTableModel
extends AbstractTableModel

2
src/net/java/sip/communicator/plugin/skinmanager/skinmanager.manifest.mf
Unescape View File

@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.skinmanager.SkinManagerActivator
Bundle-Name: Skin Manager plugin
Bundle-Description: Manage all SIP Communicator skins.
Bundle-Vendor: sip-communicator.org, Adam Netocny, CircleTech, s.r.o.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,

2
src/net/java/sip/communicator/plugin/skinresourcepack/SkinResourcesPack.java
Unescape View File

@ -16,7 +16,7 @@
/**
* The skin resource pack.
* @author Adam Netocny, CircleTech, s.r.o.
* @author Adam Netocny
*/
public class SkinResourcesPack
implements BundleActivator, SkinPack

2
src/net/java/sip/communicator/plugin/skinresourcepack/skinresourcepack.manifest.mf
Unescape View File

@ -6,4 +6,4 @@ Bundle-Version: 0.0.1
System-Bundle: no
Import-Package: org.osgi.framework,
net.java.sip.communicator.service.resources,
net.java.sip.communicator.util
net.java.sip.communicator.util

2
src/net/java/sip/communicator/service/resources/ResourceManagementService.java
Unescape View File

@ -18,7 +18,7 @@
* some configurations.
*
* @author Damian Minkov
* @author Adam Netocny, CircleTech, s.r.o.
* @author Adam Netocny
*/
public interface ResourceManagementService
{

2
src/net/java/sip/communicator/service/resources/SkinPack.java
Unescape View File

@ -10,7 +10,7 @@
/**
* Default Skin Pack interface.
* @author Adam Netocny, CircleTech, s.r.o.
* @author Adam Netocny
*/
public interface SkinPack
extends ResourcePack

Write Preview
Loading…
Cancel
Save